Changeset 255

Timestamp:

Mar 1, 2006 8:46:13 PM (18 years ago)

Author:

bennylp

Message:

Added option to perform detailed or summary only dump

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (3 diffs)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua-lib/pjsua_opt.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_pres.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -357 +357 @@
  * Terminate all calls.
  */
-void pjsua_inv_shutdown(void);
+void pjsua_call_hangup_all(void);
 
 
@@ -402 +402 @@
  * Dump presence subscriptions.
  */
-void pjsua_pres_dump(void);
+void pjsua_pres_dump(pj_bool_t detail);
 
 
@@ -461 +461 @@
  * Dump application states.
  */
-void pjsua_dump(void);
+void pjsua_dump(pj_bool_t detail);
 
 

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

@@ -1049 +1049 @@
  * Terminate all calls.
  */
-void pjsua_inv_shutdown()
+void pjsua_call_hangup_all()
 {
     int i;

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

@@ -868 +868 @@
 
     /* Terminate all calls. */
-    pjsua_inv_shutdown();
+    pjsua_call_hangup_all();
 
     /* Terminate all presence subscriptions. */

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

@@ -577 +577 @@
  * Dump application states.
  */
-void pjsua_dump(void)
+void pjsua_dump(pj_bool_t detail)
 {
     char buf[128];
@@ -587 +587 @@
     pj_log_set_decor(old_decor & (PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_CR));
 
-    pjsip_endpt_dump(pjsua.endpt, 1);
+    pjsip_endpt_dump(pjsua.endpt, detail);
     pjmedia_endpt_dump(pjsua.med_endpt);
-    pjsip_tsx_layer_dump(1);
-    pjsip_ua_dump(1);
+    pjsip_tsx_layer_dump(detail);
+    pjsip_ua_dump(detail);
 
 
     /* Dump all invite sessions: */
-    PJ_LOG(3,(THIS_FILE, "Dumping invite sessions:"));
-
-    if (pjsua.call_cnt == 0) {
-
-        PJ_LOG(3,(THIS_FILE, "  - no sessions -"));
-
-    } else {
-        int i;
-
-        for (i=0; i<pjsua.max_calls; ++i) {
-
-            if (pjsua.calls[i].inv == NULL)
-                continue;
-
-            print_call("  ", i, buf, sizeof(buf));
-            PJ_LOG(3,(THIS_FILE, "%s", buf));
-
-            if (pjsua.calls[i].session)
-                dump_media_session(pjsua.calls[i].session);
+    if (detail) {
+        PJ_LOG(3,(THIS_FILE, "Dumping invite sessions:"));
+
+        if (pjsua.call_cnt == 0) {
+
+            PJ_LOG(3,(THIS_FILE, "  - no sessions -"));
+
+        } else {
+            int i;
+
+            for (i=0; i<pjsua.max_calls; ++i) {
+
+                if (pjsua.calls[i].inv == NULL)
+                    continue;
+
+                print_call("  ", i, buf, sizeof(buf));
+                PJ_LOG(3,(THIS_FILE, "%s", buf));
+
+                if (pjsua.calls[i].session)
+                    dump_media_session(pjsua.calls[i].session);
+            }
         }
     }
 
     /* Dump presence status */
-    pjsua_pres_dump();
+    pjsua_pres_dump(detail);
 
     pj_log_set_decor(old_decor);

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

@@ -455 +455 @@
  * Dump presence status.
  */
-void pjsua_pres_dump(void)
+void pjsua_pres_dump(pj_bool_t detail)
 {
     int acc_index;
     int i;
 
+
+    /*
+     * When no detail is required, just dump number of server and client
+     * subscriptions.
+     */
+    if (detail == PJ_FALSE) {
+        
+        int count = 0;
+
+        for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
+
+            if (!pj_list_empty(&pjsua.acc[acc_index].pres_srv_list)) {
+                struct pjsua_srv_pres *uapres;
+
+                uapres = pjsua.acc[acc_index].pres_srv_list.next;
+                while (uapres != &pjsua.acc[acc_index].pres_srv_list) {
+                    ++count;
+                    uapres = uapres->next;
+                }
+            }
+        }
+
+        PJ_LOG(3,(THIS_FILE, "Number of server/UAS subscriptions: %d", 
+                  count));
+
+        count = 0;
+
+        for (i=0; i<pjsua.buddy_cnt; ++i) {
+            if (pjsua.buddies[i].sub) {
+                ++count;
+            }
+        }
+
+        PJ_LOG(3,(THIS_FILE, "Number of client/UAC subscriptions: %d", 
+                  count));
+        return;
+    }
+    
+
+    /*
+     * Dumping all server (UAS) subscriptions
+     */
     PJ_LOG(3,(THIS_FILE, "Dumping pjsua server subscriptions:"));
+
     for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
 
@@ -468 +511 @@
 
         if (pj_list_empty(&pjsua.acc[acc_index].pres_srv_list)) {
+
             PJ_LOG(3,(THIS_FILE, "  - none - "));
+
         } else {
             struct pjsua_srv_pres *uapres;
@@ -484 +529 @@
     }
 
+    /*
+     * Dumping all client (UAC) subscriptions
+     */
     PJ_LOG(3,(THIS_FILE, "Dumping pjsua client subscriptions:"));
+
     if (pjsua.buddy_cnt == 0) {
+
         PJ_LOG(3,(THIS_FILE, "  - no buddy list - "));
+
     } else {
         for (i=0; i<pjsua.buddy_cnt; ++i) {