Changeset 2771 for pjproject/trunk/pjlib/src/pjlib-test/activesock.c

Timestamp:

Jun 17, 2009 1:31:13 PM (15 years ago)

Author:

bennylp

Message:

Ticket #758 (Problem with TCP transport on Symbian)

• fixed TCP recv() to use RecvOneOrMore?()
• fixed activesock unit test in pjlib-test

File:

• pjproject/trunk/pjlib/src/pjlib-test/activesock.c (modified) (3 diffs)

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

@@ -213 +213 @@
         for (i=0; i<10 && last_rx1 == srv1->rx_cnt && last_rx2 == srv2->rx_cnt; ++i) {
             pj_time_val delay = {0, 10};
+#ifdef PJ_SYMBIAN
+            pj_symbianos_poll(-1, 100);
+#else
             pj_ioqueue_poll(ioqueue, &delay);
+#endif
         }
 
@@ -404 +408 @@
         if (status == PJ_EPENDING) {
             do {
+#if PJ_SYMBIAN
+                pj_symbianos_poll(-1, -1);
+#else
                 pj_ioqueue_poll(ioqueue, NULL);
+#endif
             } while (!state2->sent);
-        } else if (status != PJ_SUCCESS) {
-                PJ_LOG(1,("", "   err: send status=%d", status));
-            status = -180;
-            break;
-        } else if (status == PJ_SUCCESS) {
-            if (len != sizeof(*pkt)) {
-                PJ_LOG(1,("", "   err: shouldn't report partial sent"));
-                status = -190;
-                break;
-            }
+        } else {
+#if PJ_SYMBIAN
+                /* The Symbian socket always returns PJ_SUCCESS for TCP send,
+                 * eventhough the remote end hasn't received the data yet.
+                 * If we continue sending, eventually send() will block,
+                 * possibly because the send buffer is full. So we need to
+                 * poll the ioqueue periodically, to let receiver gets the 
+                 * data.
+                 */
+                pj_symbianos_poll(-1, 0);
+#endif
+                if (status != PJ_SUCCESS) {
+                    PJ_LOG(1,("", "   err: send status=%d", status));
+                    status = -180;
+                    break;
+                } else if (status == PJ_SUCCESS) {
+                    if (len != sizeof(*pkt)) {
+                        PJ_LOG(1,("", "   err: shouldn't report partial sent"));
+                        status = -190;
+                        break;
+                    }
+                }
         }
     }
@@ -421 +441 @@
     /* Wait until everything has been sent/received */
     if (state1->next_recv_seq < COUNT) {
+#ifdef PJ_SYMBIAN
+        while (pj_symbianos_poll(-1, 1000) == PJ_TRUE)
+            ;
+#else
         pj_time_val delay = {0, 100};
         while (pj_ioqueue_poll(ioqueue, &delay) > 0)
             ;
+#endif
     }