Changeset 20

Timestamp:

Nov 7, 2005 6:25:16 PM (18 years ago)

Author:

bennylp

Message:

Added more checking in UDP client

Location:

pjproject/main/pjlib

Files:

• build/os-win32.mak (modified) (1 diff)
• src/pjlib-test/echo_clt.c (modified) (8 diffs)
• src/pjlib-test/test.h (modified) (1 diff)

pjproject/main/pjlib/build/os-win32.mak

@@ -14 +14 @@
                         pool_policy_malloc.o sock_bsd.o sock_select.o
 
-export PJLIB_OBJS +=    ioqueue_win32.o
+export PJLIB_OBJS +=    ioqueue_winnt.o
 #export PJLIB_OBJS +=   ioqueue_select.o
 
-export PJLIB_OBJS +=    file_io_win32.o
+export PJLIB_OBJS +=    file_io_win32.o file_access_win32.o
 #export PJLIB_OBJS +=   file_io_ansi.o
 

pjproject/main/pjlib/src/pjlib-test/echo_clt.c

@@ -16 +16 @@
 
 static pj_atomic_t *totalBytes;
+static pj_atomic_t *timeout_counter;
+static pj_atomic_t *invalid_counter;
 
 #define MSEC_PRINT_DURATION 1000
@@ -44 +46 @@
     pj_uint32_t buffer_id;
     pj_uint32_t buffer_counter;
-    pj_uint32_t timeout_counter=0, invalid_counter=0;
     struct client *client = arg;
     pj_status_t last_recv_err = PJ_SUCCESS, last_send_err = PJ_SUCCESS;
@@ -89 +90 @@
         int rc;
         pj_ssize_t bytes;
-        pj_uint32_t *p_buffer_id, *p_buffer_counter;
 
         ++counter;
 
-        while (wait_socket(sock,0) > 0)
-            ;
+        //while (wait_socket(sock,0) > 0)
+        //    ;
 
         /* Send a packet. */
@@ -114 +114 @@
             PJ_LOG(3,("", "...timeout"));
             bytes = 0;
-            timeout_counter++;
+            pj_atomic_inc(timeout_counter);
         } else if (rc < 0) {
             rc = pj_get_netos_error();
@@ -149 +149 @@
                           "recv_buf=%s\n", 
                           counter, send_buf, recv_buf));
-            //break;
+            pj_atomic_inc(invalid_counter);
         }
 
@@ -181 +181 @@
         return -30;
     }
+    rc = pj_atomic_create(pool, 0, &invalid_counter);
+    rc = pj_atomic_create(pool, 0, &timeout_counter);
 
     PJ_LOG(3,("", "Echo client started"));
@@ -207 +209 @@
         pj_time_val elapsed;
         unsigned bw32;
+        pj_uint32_t timeout, invalid;
 
         pj_thread_sleep(1000);
@@ -226 +229 @@
         last_received = received;
 
-        PJ_LOG(3,("", "...%d threads, total bandwidth: %d KB/s", 
-                  ECHO_CLIENT_MAX_THREADS, bw32/1000));
+        timeout = pj_atomic_get(timeout_counter);
+        invalid = pj_atomic_get(invalid_counter);
+
+        PJ_LOG(3,("", 
+                  "...%d threads, total bandwidth: %d KB/s, "
+                  "timeout=%d, invalid=%d", 
+                  ECHO_CLIENT_MAX_THREADS, bw32/1000,
+                  timeout, invalid));
     }
 

pjproject/main/pjlib/src/pjlib-test/test.h

@@ -37 +37 @@
 #define INCLUDE_XML_TEST            GROUP_EXTRA
 
-#define INCLUDE_ECHO_SERVER         1
-#define INCLUDE_ECHO_CLIENT         0
+#define INCLUDE_ECHO_SERVER         0
+#define INCLUDE_ECHO_CLIENT         1