Changeset 433 for pjproject/trunk/pjlib/src/pjlib-test/ioq_udp.c

Timestamp:

May 10, 2006 7:24:40 PM (18 years ago)

Author:

bennylp

Message:

Merge-in RTEMS port patch by Phil Torre <ptorre@…>, alpha release.

File:

• pjproject/trunk/pjlib/src/pjlib-test/ioq_udp.c (modified) (10 diffs)

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

@@ -42 +42 @@
 #define PORT                51233
 #define LOOP                100
+///#define LOOP             2
 #define BUF_MIN_SIZE        32
 #define BUF_MAX_SIZE        2048
@@ -50 +51 @@
 #undef TRACE_
 #define TRACE_(msg)         PJ_LOG(3,(THIS_FILE,"....." msg))
+
+#if 0
+#  define TRACE__(args)     PJ_LOG(3,args)
+#else
+#  define TRACE__(args)
+#endif
+
 
 static pj_ssize_t            callback_read_size,
@@ -70 +78 @@
     callback_read_op = op_key;
     callback_read_size = bytes_read;
+    TRACE__((THIS_FILE, "     callback_read_key = %p, bytes=%d", 
+             key, bytes_read));
 }
 
@@ -255 +265 @@
             status=-45; goto on_error;
         } else if (rc < 0) {
-            app_perror("...ERROR in ioqueue_poll()", rc);
+            app_perror("...ERROR in ioqueue_poll()", -rc);
             status=-50; goto on_error;
         }
@@ -493 +503 @@
     pj_ioqueue_key_t **key;
     pj_status_t rc;
-    int count, i;
+    int count, i; /* must be signed */
 
     PJ_LOG(3,(THIS_FILE,"...testing with so many handles"));
@@ -534 +544 @@
     /* Now deregister and close all handles. */ 
 
-    for (i=0; i<count; ++i) {
+    /* NOTE for RTEMS:
+     *  It seems that the order of close(sock) is pretty important here.
+     *  If we close the sockets with the same order as when they were created,
+     *  RTEMS doesn't seem to reuse the sockets, thus next socket created
+     *  will have descriptor higher than the last socket created.
+     *  If we close the sockets in the reverse order, then the descriptor will
+     *  get reused.
+     *  This used to cause problem with select ioqueue, since the ioqueue
+     *  always gives FD_SETSIZE for the first select() argument. This ioqueue
+     *  behavior can be changed with setting PJ_SELECT_NEEDS_NFDS macro.
+     */
+    for (i=count-1; i>=0; --i) {
+    ///for (i=0; i<count; ++i) {
         rc = pj_ioqueue_unregister(key[i]);
         if (rc != PJ_SUCCESS) {
@@ -571 +593 @@
     pj_ioqueue_key_t *skey, *ckey, *key;
     pj_timestamp t1, t2, t_elapsed;
-    int rc=0, i;
+    int rc=0, i;    /* i must be signed */
     pj_str_t temp;
-    char errbuf[128];
+    char errbuf[PJ_ERR_MSG_SIZE];
+
+    TRACE__((THIS_FILE, "   bench test %d", inactive_sock_count));
 
     // Create pool.
@@ -692 +716 @@
                                &addr, sizeof(addr));
         if (rc != PJ_SUCCESS && rc != PJ_EPENDING) {
-            app_perror("...error: pj_ioqueue_write()", bytes);
+            app_perror("...error: pj_ioqueue_write()", rc);
             break;
+        }
+        if (rc == PJ_SUCCESS) {
+            if (bytes < 0) {
+                app_perror("...error: pj_ioqueue_sendto()", -bytes);
+                break;
+            }
         }
 
@@ -702 +732 @@
         callback_read_key = NULL;
         callback_read_size = 0;
+        TRACE__((THIS_FILE, "     waiting for key = %p", skey));
         do {
-            rc = pj_ioqueue_poll(ioque, NULL);
+            pj_time_val timeout = { 1, 0 };
+            rc = pj_ioqueue_poll(ioque, &timeout);
+            TRACE__((THIS_FILE, "     poll rc=%d", rc));
         } while (rc >= 0 && callback_read_key != skey);
 
@@ -750 +783 @@
 
     // Cleaning up.
-    for (i=0; i<inactive_sock_count; ++i)
+    for (i=inactive_sock_count-1; i>=0; --i) {
         pj_sock_close(inactive_sock[i]);
+    }
+
     pj_sock_close(ssock);
     pj_sock_close(csock);
+
 
     pj_ioqueue_destroy(ioque);