Changeset 2067

Timestamp:

Jun 26, 2008 8:23:47 PM (16 years ago)

Author:

bennylp

Message:

Added option to disable stdout buffering in pjsua, and adjust the python tests

Location:

pjproject/trunk/pjsip-apps/src

Files:

• pjsua/pjsua_app.c (modified) (3 diffs)
• test-pjsua/mod_call.py (modified) (9 diffs)
• test-pjsua/run.py (modified) (1 diff)

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

@@ -465 +465 @@
            OPT_CAPTURE_LAT, OPT_PLAYBACK_LAT, OPT_NO_TONES,
            OPT_STDOUT_REFRESH, OPT_STDOUT_REFRESH_TEXT,
+#ifdef _IONBF
+           OPT_STDOUT_NO_BUF,
+#endif
            OPT_AUTO_UPDATE_NAT,OPT_USE_COMPACT_FORM,OPT_DIS_CODEC
     };
@@ -555 +558 @@
         { "stdout-refresh", 1, 0, OPT_STDOUT_REFRESH},
         { "stdout-refresh-text", 1, 0, OPT_STDOUT_REFRESH_TEXT},
+#ifdef _IONBF
+        { "stdout-no-buf",  0, 0, OPT_STDOUT_NO_BUF },
+#endif
         { "snd-auto-close", 1, 0, OPT_SND_AUTO_CLOSE},
         { "no-tones",    0, 0, OPT_NO_TONES},
@@ -1146 +1152 @@
             stdout_refresh_text = pj_optarg;
             break;
+
+#ifdef _IONBF
+        case OPT_STDOUT_NO_BUF:
+            setvbuf(stdout, NULL, _IONBF, 0);
+            break;
+#endif
 
         case OPT_CAPTURE_LAT:

pjproject/trunk/pjsip-apps/src/test-pjsua/mod_call.py

@@ -37 +37 @@
         
         # Callee waits for call and answers with 180/Ringing
-        time.sleep(1)
+        time.sleep(0.2)
         callee.expect(const.EVENT_INCOMING_CALL)
         callee.send("a")
@@ -53 +53 @@
 
         # Wait until call is connected in both endpoints
-        time.sleep(1)
+        time.sleep(0.2)
         caller.expect(const.STATE_CONFIRMED)
         callee.expect(const.STATE_CONFIRMED)
@@ -60 +60 @@
         caller.sync_stdout()
         callee.sync_stdout()
-        time.sleep(1)
-        caller.sync_stdout()
-        callee.sync_stdout()
-
-        # Test that media is okay
-        time.sleep(2)
+        time.sleep(0.1)
+        caller.sync_stdout()
+        callee.sync_stdout()
+
+        # Test that media is okay
+        time.sleep(0.3)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -80 +80 @@
 
         # Release hold
-        time.sleep(2)
+        time.sleep(0.5)
         caller.send("v")
         #caller.sync_stdout()
@@ -109 +109 @@
 
         # Release hold
-        time.sleep(2)
+        time.sleep(0.5)
         callee.send("v")
         #callee.sync_stdout()
@@ -138 +138 @@
 
         # Test that media is okay
-        time.sleep(2)
+        time.sleep(0.1)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -153 +153 @@
 
         # Test that media is okay
-        time.sleep(2)
+        time.sleep(0.1)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -182 +182 @@
         
         # Test that media is still okay
-        time.sleep(2)
+        time.sleep(0.1)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -194 +194 @@
         
         # Test that media is still okay
-        time.sleep(2)
+        time.sleep(0.1)
         check_media(callee, caller)
         check_media(caller, callee)
 
         # Hangup call
-        time.sleep(1)
+        time.sleep(0.1)
         caller.send("h")
-        caller.sync_stdout()
 
         # Wait until calls are cleared in both endpoints

pjproject/trunk/pjsip-apps/src/test-pjsua/run.py

@@ -60 +60 @@
                 self.echo = inst_param.echo_enabled
                 self.trace_enabled = inst_param.trace_enabled
-                fullcmd = G_EXE + " " + inst_param.arg + " --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
+                fullcmd = G_EXE + " " + inst_param.arg + " --stdout-no-buf --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
                 self.trace("Popen " + fullcmd)
                 self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=False)