Changeset 2008 for pjproject/trunk

Timestamp:

Jun 12, 2008 1:30:39 PM (16 years ago)

Author:

bennylp

Message:

Added echo option and stdout refresh in pjsua to assist automated test scripts

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (9 diffs)

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

@@ -93 +93 @@
 #define current_acc     pjsua_acc_get_default()
 static pjsua_call_id    current_call = PJSUA_INVALID_ID;
+static pj_bool_t        cmd_echo;
+static int              stdout_refresh = -1;
+static const char      *stdout_refresh_text = "STDOUT_REFRESH";
+static pj_bool_t        stdout_refresh_quit = PJ_FALSE;
 static pj_str_t         uri_arg;
 
@@ -420 +424 @@
            OPT_CAPTURE_DEV, OPT_PLAYBACK_DEV,
            OPT_CAPTURE_LAT, OPT_PLAYBACK_LAT,
+           OPT_STDOUT_REFRESH, OPT_STDOUT_REFRESH_TEXT,
            OPT_AUTO_UPDATE_NAT,OPT_USE_COMPACT_FORM,OPT_DIS_CODEC
     };
@@ -508 +513 @@
         { "capture-lat",    1, 0, OPT_CAPTURE_LAT},
         { "playback-lat",   1, 0, OPT_PLAYBACK_LAT},
+        { "stdout-refresh", 1, 0, OPT_STDOUT_REFRESH},
+        { "stdout-refresh-text", 1, 0, OPT_STDOUT_REFRESH_TEXT},
         { NULL, 0, 0, 0}
     };
@@ -1084 +1091 @@
         case OPT_PLAYBACK_DEV:
             cfg->playback_dev = atoi(pj_optarg);
+            break;
+
+        case OPT_STDOUT_REFRESH:
+            stdout_refresh = atoi(pj_optarg);
+            break;
+
+        case OPT_STDOUT_REFRESH_TEXT:
+            stdout_refresh_text = pj_optarg;
             break;
 
@@ -2276 +2291 @@
     puts("|  S  Send arbitrary REQUEST   | Cp  Codec priorities     |  f  Save config   |");
     puts("+------------------------------+--------------------------+-------------------+");
-    puts("|  q  QUIT       sleep N: console sleep for N ms    n: detect NAT type        |");
+    puts("|  q  QUIT       sleep MS     echo [0|1]            n: detect NAT type        |");
     puts("+=============================================================================+");
 
@@ -2648 +2663 @@
         }
 
+        if (cmd_echo) {
+            printf("%s", menuin);
+        }
+
         switch (menuin[0]) {
 
@@ -3309 +3328 @@
 
             send_request(text, &tmp);
+            break;
+
+        case 'e':
+            if (pj_ansi_strnicmp(menuin, "echo", 4)==0) {
+                pj_str_t tmp;
+
+                tmp.ptr = menuin+5;
+                tmp.slen = pj_ansi_strlen(menuin)-6;
+
+                if (tmp.slen < 1) {
+                    puts("Usage: echo [0|1]");
+                    break;
+                }
+
+                cmd_echo = pj_strtoul(&tmp);
+            }
             break;
 
@@ -3768 +3803 @@
 
 
+static int stdout_refresh_proc(void *arg)
+{
+    PJ_UNUSED_ARG(arg);
+
+    /* Set thread to lowest priority so that it doesn't clobber
+     * stdout output
+     */
+    pj_thread_set_prio(pj_thread_this(), 
+                       pj_thread_get_prio_min(pj_thread_this()));
+
+    while (!stdout_refresh_quit) {
+        pj_thread_sleep(stdout_refresh * 1000);
+        puts(stdout_refresh_text);
+        fflush(stdout);
+    }
+
+    return 0;
+}
+
 pj_status_t app_main(void)
 {
+    pj_thread_t *stdout_refresh_thread = NULL;
     pj_status_t status;
 
@@ -3779 +3834 @@
     }
 
+    /* Start console refresh thread */
+    if (stdout_refresh > 0) {
+        pj_thread_create(app_config.pool, "stdout", &stdout_refresh_proc,
+                         NULL, 0, 0, &stdout_refresh_thread);
+    }
+
     console_app_main(&uri_arg);
+
+    if (stdout_refresh_thread) {
+        stdout_refresh_quit = PJ_TRUE;
+        pj_thread_join(stdout_refresh_thread);
+        pj_thread_destroy(stdout_refresh_thread);
+    }
 
     return PJ_SUCCESS;