Changeset 2983

Timestamp:

Nov 4, 2009 3:35:13 AM (15 years ago)

Author:

nanang

Message:

Misc fix (#951): Fixed possible random/unexpected pairs generated in ioqueue tcp unit test (such case was occured when test was performed using IOCP ioqueue on Vista).

File:

• pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.c

@@ -758 +758 @@
             }
 
-        }
-
-
-        // Poll until all connected
-        while (pending_op) {
-            pj_time_val timeout = {1, 0};
+            // Poll until connection of this pair established
+            while (pending_op) {
+                pj_time_val timeout = {1, 0};
 
 #ifdef PJ_SYMBIAN
-            status = pj_symbianos_poll(-1, 1000);
+                status = pj_symbianos_poll(-1, 1000);
 #else
-            status = pj_ioqueue_poll(ioque, &timeout);
+                status = pj_ioqueue_poll(ioque, &timeout);
 #endif
-            if (status > 0) {
-                if (status > pending_op) {
-                    PJ_LOG(3,(THIS_FILE,
-                              "...error: pj_ioqueue_poll() returned %d "
-                              "(only expecting %d)",
-                              status, pending_op));
-                    return -110;
-                }
-                pending_op -= status;
-
-                if (pending_op == 0) {
-                    status = 0;
+                if (status > 0) {
+                    if (status > pending_op) {
+                        PJ_LOG(3,(THIS_FILE,
+                                  "...error: pj_ioqueue_poll() returned %d "
+                                  "(only expecting %d)",
+                                  status, pending_op));
+                        return -110;
+                    }
+                    pending_op -= status;
+
+                    if (pending_op == 0) {
+                        status = 0;
+                    }
                 }
             }