Changeset 660

Timestamp:

Aug 7, 2006 1:22:23 PM (18 years ago)

Author:

bennylp

Message:

Added Ctrl-C handler for pjsua Windows, and added average bps in media statistic.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/main.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/main.c

@@ -29 +29 @@
 pj_status_t app_destroy(void);
 
+
+#if defined(PJ_WIN32) && PJ_WIN32!=0
+#include <windows.h>
+
+static pj_thread_desc handler_desc;
+
+static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
+{
+    pj_thread_t *thread;
+
+    switch (fdwCtrlType) 
+    { 
+        // Handle the CTRL+C signal. 
+ 
+        case CTRL_C_EVENT: 
+        case CTRL_CLOSE_EVENT: 
+        case CTRL_BREAK_EVENT: 
+        case CTRL_LOGOFF_EVENT: 
+        case CTRL_SHUTDOWN_EVENT: 
+            pj_thread_register("ctrlhandler", handler_desc, &thread);
+            PJ_LOG(3,(THIS_FILE, "Ctrl-C detected, quitting.."));
+            app_destroy();
+            ExitProcess(1);
+            return TRUE; 
+ 
+        default: 
+ 
+            return FALSE; 
+    } 
+}
+
+static void setup_signal_handler(void)
+{
+    SetConsoleCtrlHandler(&CtrlHandler, TRUE);
+}
+
+#else
+
+static void setup_signal_handler(void)
+{
+}
+
+#endif
+
 int main(int argc, char *argv[])
 {
     if (app_init(argc, argv) != PJ_SUCCESS)
         return 1;
+
+    setup_signal_handler();
 
     app_main();

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1278 +1278 @@
         const char *dir;
         char last_update[64];
-        char packets[32], bytes[32], ipbytes[32];
-        pj_time_val now;
+        char packets[32], bytes[32], ipbytes[32], avg_bps[32];
+        pj_time_val media_duration, now;
 
         pjmedia_session_get_stream_stat(session, i, &stat);
@@ -1324 +1324 @@
         }
 
+        pj_gettimeofday(&media_duration);
+        PJ_TIME_VAL_SUB(media_duration, stat.start);
+        if (PJ_TIME_VAL_MSEC(media_duration) == 0)
+            media_duration.msec = 1;
+
         len = pj_ansi_snprintf(p, end-p,
                "%s     RX pt=%d, stat last update: %s\n"
-               "%s        total %spkt %sB (%sB +IP hdr)\n"
+               "%s        total %spkt %sB (%sB +IP hdr) @avg=%sbps\n"
                "%s        pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)\n"
                "%s              (msec)    min     avg     max     last\n"
@@ -1337 +1342 @@
                good_number(bytes, stat.rx.bytes),
                good_number(ipbytes, stat.rx.bytes + stat.rx.pkt * 32),
+               good_number(avg_bps, stat.rx.bytes * 8 * 1000 / PJ_TIME_VAL_MSEC(media_duration)),
                indent,
                stat.rx.loss,
@@ -1380 +1386 @@
         len = pj_ansi_snprintf(p, end-p,
                "%s     TX pt=%d, ptime=%dms, stat last update: %s\n"
-               "%s        total %spkt %sB (%sB +IP hdr)\n"
+               "%s        total %spkt %sB (%sB +IP hdr) @avg %sbps\n"
                "%s        pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)\n"
                "%s              (msec)    min     avg     max     last\n"
@@ -1395 +1401 @@
                good_number(bytes, stat.tx.bytes),
                good_number(ipbytes, stat.tx.bytes + stat.tx.pkt * 32),
+               good_number(avg_bps, stat.tx.bytes * 8 * 1000 / PJ_TIME_VAL_MSEC(media_duration)),
 
                indent,