Changeset 603

Timestamp:

Jul 11, 2006 12:25:45 PM (18 years ago)

Author:

bennylp

Message:

Some minor modifications here and there in pjsip-perf

File:

• pjproject/trunk/pjsip-apps/src/samples/pjsip-perf.c (modified) (11 diffs)

pjproject/trunk/pjsip-apps/src/samples/pjsip-perf.c

@@ -155 +155 @@
         pj_time_val          last_completion;
         unsigned             total_responses;
-        unsigned             status_class[7];
+        unsigned             response_codes[800];
     } client;
 
@@ -568 +568 @@
 {
     app.client.job_finished++;
-    app.client.status_class[status_code/100]++;
+    if (status_code >= 200 && status_code < 800)
+        app.client.response_codes[status_code]++;
     app.client.total_responses++;
     pj_gettimeofday(&app.client.last_completion);
@@ -1258 +1259 @@
 static int client_thread(void *arg)
 {
-    unsigned last_timeout_check = 0;
     pj_time_val end_time, last_report, now;
     unsigned thread_index = (unsigned)arg;
+    unsigned cycle = 0, last_cycle = 0;
 
     pj_thread_sleep(100);
@@ -1288 +1289 @@
 
         /* Wait if there are more pending jobs than allowed in the
-         * window.
+         * window. But spawn a new job anyway if no events are happening
+         * after we wait for some time.
          */
-        for (i=0; outstanding > (int)app.client.job_window && i<100; ++i) {
-            pjsip_endpt_handle_events(app.sip_endpt, &timeout);
+        for (i=0; outstanding > (int)app.client.job_window && i<1000; ++i) {
+            pj_time_val wait = { 0, 500 };
+            unsigned count = 0;
+
+            pjsip_endpt_handle_events2(app.sip_endpt, &wait, &count);
             outstanding = app.client.job_submitted - app.client.job_finished;
+
+            if (count == 0)
+                break;
+
+            ++cycle;
         }
 
@@ -1306 +1316 @@
 
         ++app.client.job_submitted;
+        ++cycle;
 
         /* Handle event */
@@ -1311 +1322 @@
 
         /* Check for time out, also print report */
-        if (app.client.job_submitted - last_timeout_check >= 500) {
+        if (cycle - last_cycle >= 500) {
             pj_gettimeofday(&now);
             if (PJ_TIME_VAL_GTE(now, end_time)) {
                 break;
             }
-            last_timeout_check = app.client.job_submitted;
+            last_cycle = cycle;
 
             
@@ -1361 +1372 @@
     }
 
-    /* Wait couple of seconds if there are still unfinished jobs */
+    /* Wait couple of seconds to let jobs completes (e.g. ACKs to be sent)  */
     pj_gettimeofday(&now);
     end_time = now;
     end_time.sec += 2;
-    while (PJ_TIME_VAL_LT(now, end_time) && 
-           app.client.job_finished < app.client.job_submitted) 
+    while (PJ_TIME_VAL_LT(now, end_time)) 
     {
         pj_time_val timeout = { 0, 1 };
@@ -1585 +1595 @@
             report, sizeof(report),
             "Total %d %s sent in %d ms at rate of %d/sec\n"
-            "Total %d responses receieved in %d ms:\n"
-            " - 2xx responses:  %7d (rate=%d/sec)\n"
-            " - 3xx responses:  %7d (rate=%d/sec)\n"
-            " - 4xx responses:  %7d (rate=%d/sec)\n"
-            " - 5xx responses:  %7d (rate=%d/sec)\n"
-            " - 6xx responses:  %7d (rate=%d/sec)\n"
-            " - 7xx responses:  %7d (rate=%d/sec)\n"
-            "                       ----------------\n"
-            " TOTAL responses:  %7d (rate=%d/sec)\n",
+            "Total %d responses receieved in %d ms at rate of %d/sec:",
             app.client.job_submitted, test_type, msec_req, 
             app.client.job_submitted * 1000 / msec_req,
             app.client.total_responses, msec_res,
-            app.client.status_class[2], app.client.status_class[2]*1000/msec_res,
-            app.client.status_class[3], app.client.status_class[3]*1000/msec_res,
-            app.client.status_class[4], app.client.status_class[4]*1000/msec_res,
-            app.client.status_class[5], app.client.status_class[5]*1000/msec_res,
-            app.client.status_class[6], app.client.status_class[6]*1000/msec_res,
-            app.client.status_class[7], app.client.status_class[7]*1000/msec_res,
-            app.client.total_responses, app.client.total_responses*1000/msec_res);
+            app.client.total_responses*1000/msec_res);
+        write_report(report);
+
+        /* Print detailed response code received */
+        pj_ansi_sprintf(report, "\nDetailed responses received:");
+        write_report(report);
+
+        for (i=0; i<PJ_ARRAY_SIZE(app.client.response_codes); ++i) {
+            const pj_str_t *reason;
+
+            if (app.client.response_codes[i] == 0)
+                continue;
+
+            reason = pjsip_get_status_text(i);
+            pj_ansi_snprintf( report, sizeof(report),
+                              " - %d responses:  %7d     (%.*s)",
+                              i, app.client.response_codes[i],
+                              (int)reason->slen, reason->ptr);
+            write_report(report);
+        }
+
+        /* Total responses and rate */
+        pj_ansi_snprintf( report, sizeof(report),
+            "                    ------\n"
+            " TOTAL responses:  %7d (rate=%d/sec)\n",
+            app.client.total_responses, 
+            app.client.total_responses*1000/msec_res);
 
         write_report(report);
@@ -1618 +1640 @@
         unsigned i;
 
-        puts("");
         puts("pjsip-perf started in server-mode");
 
         printf("Receiving requests on the following URIs:\n"
-               "  sip:0@%.*s:%d;transport=%s    for stateless handling (non-INVITE only)\n"
-               "  sip:1@%.*s:%d;transport=%s    for stateful handling (INVITE and non-INVITE)\n"
-               "  sip:2@%.*s:%d;transport=%s    for call handling (INVITE only)\n",
+               "  sip:0@%.*s:%d%s    for stateless handling\n"
+               "  sip:1@%.*s:%d%s    for stateful handling\n"
+               "  sip:2@%.*s:%d%s    for call handling\n",
                (int)app.local_addr.slen,
                app.local_addr.ptr,
                app.local_port,
-               (app.use_tcp ? "tcp" : "udp"),
+               (app.use_tcp ? ";transport=tcp" : ""),
                (int)app.local_addr.slen,
                app.local_addr.ptr,
                app.local_port,
-               (app.use_tcp ? "tcp" : "udp"),
+               (app.use_tcp ? ";transport=tcp" : ""),
                (int)app.local_addr.slen,
                app.local_addr.ptr,
                app.local_port,
-               (app.use_tcp ? "tcp" : "udp"));
+               (app.use_tcp ? ";transport=tcp" : ""));
 
         for (i=0; i<app.thread_count; ++i) {
@@ -1647 +1668 @@
         }
 
-        puts("Press <ENTER> to quit");
+        puts("\nPress <ENTER> to quit\n");
         fflush(stdout);
         fgets(s, sizeof(s), stdin);
@@ -1656 +1677 @@
             app.thread[i] = NULL;
         }
+
+        puts("");
     }