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

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

2 files changed, 57 insertions, 4 deletions

diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
index 7775687d..9541e849 100644
--- a/pjsip-apps/src/pjsua/main.c
+++ b/pjsip-apps/src/pjsua/main.c
@@ -28,11 +28,57 @@ pj_status_t app_init(int argc, char *argv[]);
 pj_status_t app_main(void);
 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();
     app_destroy();
 
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c
index 68231718..f2517536 100644
--- a/pjsip/src/pjsua-lib/pjsua_call.c
+++ b/pjsip/src/pjsua-lib/pjsua_call.c
@@ -1277,8 +1277,8 @@ static void dump_media_session(const char *indent,
 	int rem_port;
 	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);
 	rem_addr = pj_inet_ntoa(info.stream_info[i].rem_addr.sin_addr);
@@ -1323,9 +1323,14 @@ static void dump_media_session(const char *indent,
 		    now.msec);
 	}
 
+	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"
 	       "%s        loss period: %7.3f %7.3f %7.3f %7.3f\n"
@@ -1336,6 +1341,7 @@ static void dump_media_session(const char *indent,
 	       good_number(packets, stat.rx.pkt),
 	       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,
 	       stat.rx.loss * 100.0 / (stat.rx.pkt + stat.rx.loss),
@@ -1379,7 +1385,7 @@ static void dump_media_session(const char *indent,
 
 	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"
 	       "%s        loss period: %7.3f %7.3f %7.3f %7.3f\n"
@@ -1394,6 +1400,7 @@ static void dump_media_session(const char *indent,
 	       good_number(packets, stat.tx.pkt),
 	       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,
 	       stat.tx.loss,