Getting-Started/BB10: bb_measure_cpu.patch

pjsip/include/pjsua-lib/pjsua_internal.h

@@ -128 +128 @@
     pjsip_status_code    last_code; /**< Last status code seen.             */
     pj_str_t             last_text; /**< Last status text seen.             */
     pj_time_val          start_time;/**< First INVITE sent/received.        */
+    pj_uint32_t          ms_utime;  /**< Starting tms.tms_utime in msec     */
+    pj_uint32_t          ms_stime;  /**< Starting tms.tms_stime in msec     */
     pj_time_val          res_time;  /**< First response sent/received.      */
     pj_time_val          conn_time; /**< Connected/confirmed time.          */
     pj_time_val          dis_time;  /**< Disconnect time.                   */

pjsip/src/pjsua-lib/pjsua_dump.c

@@ -382 +382 @@
                     {
                         pjmedia_srtp_info *srtp_info =
                                     (pjmedia_srtp_info*) tp_info.spc_info[j].buffer;
+                        const char *policy_name = srtp_info->tx_policy.name.ptr;
 
+                        if (!policy_name)
+                            policy_name = "";
+
                         len = pj_ansi_snprintf(p, end-p,
                                                "   %s  SRTP status: %s Crypto-suite: %s",
                                                indent,
                                                (srtp_info->active?"Active":"Not active"),
-                                               srtp_info->tx_policy.name.ptr);
+                                               policy_name);
                         if (len > 0 && len < end-p) {
                             p += len;
                             *p++ = '\n';
@@ -912 +916 @@
         buf[len] = '\0';
 }
 
+void init_call_times(pj_uint32_t *ms_utime, pj_uint32_t *ms_stime);
 
 /*
  * Dump call and media statistics to string.
@@ -925 +930 @@
     pjsua_call *call;
     pjsip_dialog *dlg;
     pj_time_val duration, res_delay, con_delay;
+    unsigned cpu_user_pct, cpu_system_pct;
     char tmp[128];
     char *p, *end;
     pj_status_t status;
@@ -970 +976 @@
         res_delay.sec = res_delay.msec = 0;
     }
 
+    if (call->ms_utime) {
+        pj_time_val now;
+        pj_uint32_t ms_duration, ms_utime, ms_stime;
+
+        pj_gettimeofday(&now);
+        PJ_TIME_VAL_SUB(now, call->start_time);
+        ms_duration = PJ_TIME_VAL_MSEC(now);
+
+        if (ms_duration != 0) {
+            init_call_times(&ms_utime, &ms_stime);
+
+            cpu_user_pct = (ms_utime - call->ms_utime) * 100 / ms_duration;
+            cpu_system_pct = (ms_stime - call->ms_stime) * 100 / ms_duration;
+        } else {
+            cpu_user_pct = cpu_system_pct = 0;
+        }
+    }
+
     /* Print duration */
     len = pj_ansi_snprintf(p, end-p,
                            "%s  Call time: %02dh:%02dm:%02ds, "
-                           "1st res in %d ms, conn in %dms",
+                           "1st res in %d ms, conn in %dms, cpu (u|s|t)=%u|%u|%u%%",
                            indent,
                            (int)(duration.sec / 3600),
                            (int)((duration.sec % 3600)/60),
                            (int)(duration.sec % 60),
                            (int)PJ_TIME_VAL_MSEC(res_delay),
-                           (int)PJ_TIME_VAL_MSEC(con_delay));
+                           (int)PJ_TIME_VAL_MSEC(con_delay),
+                           cpu_user_pct, cpu_system_pct,
+                           cpu_user_pct + cpu_system_pct);
 
     if (len > 0 && len < end-p) {
         p += len;

pjsip/src/pjsua-lib/pjsua_call.c

@@ -596 +596 @@
     return PJ_SUCCESS;
 }
 
+#include <sys/times.h>
+#include <time.h>
+
+void init_call_times(pj_uint32_t *ms_utime, pj_uint32_t *ms_stime)
+{
+    struct tms tms;
+    int ret;
+
+    ret = times(&tms);
+
+    if (1) {
+        *ms_utime = tms.tms_utime * 1000 /  CLK_TCK;
+        *ms_stime = tms.tms_stime * 1000 /  CLK_TCK;
+    } else {
+        *ms_utime = *ms_stime = 0;
+    }
+}
+
 /*
  * Make outgoing call to the specified URI using the specified account.
  */
@@ -697 +715 @@
 
     /* Mark call start time. */
     pj_gettimeofday(&call->start_time);
+    init_call_times(&call->ms_utime, &call->ms_stime);
 
     /* Reset first response time */
     call->res_time.sec = 0;
@@ -1077 +1096 @@
 
     /* Mark call start time. */
     pj_gettimeofday(&call->start_time);
+    init_call_times(&call->ms_utime, &call->ms_stime);
 
     /* Check INVITE request for Replaces header. If Replaces header is
      * present, the function will make sure that we can handle the request.