UDP echo testing in Linux

git-svn-id: http://svn.pjsip.org/repos/pjproject/main@19 74dad513-b988-da41-8d7b-12977e46ad98

1 files changed, 60 insertions, 60 deletions

diff --git a/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/pjlib/src/pjlib-test/udp_echo_srv_sync.c
index 19ee702c..7f371709 100644
--- a/pjlib/src/pjlib-test/udp_echo_srv_sync.c
+++ b/pjlib/src/pjlib-test/udp_echo_srv_sync.c
@@ -3,7 +3,7 @@
 #include "test.h"
 #include <pjlib.h>
 
-static pj_atomic_t *total_bytes;

+static pj_atomic_t *total_bytes;
 
 static int worker_thread(void *arg)
 {
@@ -47,7 +47,7 @@ int echo_srv_sync(void)
     pj_pool_t *pool;
     pj_sock_t sock;
     pj_thread_t *thread[ECHO_SERVER_MAX_THREADS];
-    pj_status_t rc;

+    pj_status_t rc;
     int i;
 
     pool = pj_pool_create(mem, NULL, 4000, 4000, NULL);
@@ -60,7 +60,7 @@ int echo_srv_sync(void)
         return -6;
     }
 
-    rc = app_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, ECHO_SERVER_START_PORT, &sock);
+    rc = app_socket(PJ_AF_INET, PJ_SOCK_DGRAM,0, ECHO_SERVER_START_PORT, &sock);
     if (rc != PJ_SUCCESS) {
         app_perror("...socket error", rc);
         return -10;
@@ -80,64 +80,64 @@ int echo_srv_sync(void)
                   ECHO_SERVER_MAX_THREADS, ECHO_SERVER_START_PORT));
     PJ_LOG(3,("", "...Press Ctrl-C to abort"));
 
-    echo_srv_common_loop(total_bytes);

+    echo_srv_common_loop(total_bytes);
     return 0;
 }
 
 
-int echo_srv_common_loop(pj_atomic_t *bytes_counter)

-{

-    pj_highprec_t last_received, avg_bw, highest_bw;

-    pj_time_val last_print;

-    unsigned count;

-

-    last_received = 0;

-    pj_gettimeofday(&last_print);

-    avg_bw = highest_bw = 0;

-    count = 0;

-

-    for (;;) {

-        pj_highprec_t received, cur_received, bw;

-        unsigned msec;

-        pj_time_val now, duration;

-

-        pj_thread_sleep(1000);

-

-        received = cur_received = pj_atomic_get(bytes_counter);

-        cur_received = cur_received - last_received;

-

-        pj_gettimeofday(&now);

-        duration = now;

-        PJ_TIME_VAL_SUB(duration, last_print);

-        msec = PJ_TIME_VAL_MSEC(duration);

-        

-        bw = cur_received;

-        pj_highprec_mul(bw, 1000);

-        pj_highprec_div(bw, msec);

-

-        last_print = now;

-        last_received = received;

-

-        avg_bw = avg_bw + bw;

-        count++;

-

-        PJ_LOG(3,("", "Synchronous UDP (%d threads): %u KB/s  (avg=%u KB/s) %s", 

-                  ECHO_SERVER_MAX_THREADS, 

-                  (unsigned)(bw / 1000),

-                  (unsigned)(avg_bw / count / 1000),

-                  (count==20 ? "<ses avg>" : "")));

-

-        if (count==20) {

-            if (avg_bw/count > highest_bw)

-                highest_bw = avg_bw/count;

-

-            count = 0;

-            avg_bw = 0;

-

-            PJ_LOG(3,("", "Highest average bandwidth=%u KB/s",

-                          (unsigned)(highest_bw/1000)));

-        }

-    }

-}

-

-

+int echo_srv_common_loop(pj_atomic_t *bytes_counter)
+{
+    pj_highprec_t last_received, avg_bw, highest_bw;
+    pj_time_val last_print;
+    unsigned count;
+
+    last_received = 0;
+    pj_gettimeofday(&last_print);
+    avg_bw = highest_bw = 0;
+    count = 0;
+
+    for (;;) {
+        pj_highprec_t received, cur_received, bw;
+        unsigned msec;
+        pj_time_val now, duration;
+
+        pj_thread_sleep(1000);
+
+        received = cur_received = pj_atomic_get(bytes_counter);
+        cur_received = cur_received - last_received;
+
+        pj_gettimeofday(&now);
+        duration = now;
+        PJ_TIME_VAL_SUB(duration, last_print);
+        msec = PJ_TIME_VAL_MSEC(duration);
+        
+        bw = cur_received;
+        pj_highprec_mul(bw, 1000);
+        pj_highprec_div(bw, msec);
+
+        last_print = now;
+        last_received = received;
+
+        avg_bw = avg_bw + bw;
+        count++;
+
+        PJ_LOG(3,("", "Synchronous UDP (%d threads): %u KB/s (avg=%u KB/s) %s", 
+                  ECHO_SERVER_MAX_THREADS, 
+                  (unsigned)(bw / 1000),
+                  (unsigned)(avg_bw / count / 1000),
+                  (count==20 ? "<ses avg>" : "")));
+
+        if (count==20) {
+            if (avg_bw/count > highest_bw)
+                highest_bw = avg_bw/count;
+
+            count = 0;
+            avg_bw = 0;
+
+            PJ_LOG(3,("", "Highest average bandwidth=%u KB/s",
+                          (unsigned)(highest_bw/1000)));
+        }
+    }
+}
+
+