Changeset 5065

Timestamp:

Apr 13, 2015 12:14:02 PM (9 years ago)

Author:

nanang

Message:

Re #1842: Updated pjsua app to avoid stdout buffering, and also adjusted python tests accordingly.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app_config.c (modified) (2 diffs)
• pjsip-apps/src/pjsua/pjsua_app_legacy.c (modified) (4 diffs)
• tests/pjsua/mod_call.py (modified) (9 diffs)
• tests/pjsua/scripts-call/300_ice_1_1.py (modified) (1 diff)
• tests/pjsua/scripts-call/305_ice_comp_1_2.py (modified) (1 diff)
• tests/pjsua/scripts-call/305_ice_comp_2_1.py (modified) (1 diff)
• tests/pjsua/scripts-sendto/200_ice_success_2.py (modified) (1 diff)
• tests/pjsua/scripts-sendto/200_ice_success_3.py (modified) (1 diff)
• tests/pjsua/scripts-sendto/200_ice_success_4.py (modified) (1 diff)

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

@@ -212 +212 @@
     puts  ("");
 
+    fflush(stdout);
+}
+
+static void log_writer_nobuf(int level, const char *buffer, int len)
+{
+    pj_log_write(level, buffer, len);
     fflush(stdout);
 }
@@ -1252 +1258 @@
         case OPT_STDOUT_NO_BUF:
             setvbuf(stdout, NULL, _IONBF, 0);
+            cfg->log_cfg.cb = &log_writer_nobuf;
             break;
 #endif

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

@@ -24 +24 @@
 #define THIS_FILE       "pjsua_app_legacy.c"
 
+
+/* An attempt to avoid stdout buffering for python tests:
+ * - call 'fflush(stdout)' after each call to 'printf()/puts()'
+ * - apply 'setbuf(stdout, 0)', but it is not guaranteed by the standard:
+ *   http://stackoverflow.com/questions/1716296
+ */
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+    (defined (_MSC_VER) && _MSC_VER >= 1400)
+/* Variadic macro is introduced in C99; MSVC supports it in since 2005. */
+#  define printf(...) {printf(__VA_ARGS__);fflush(stdout);}
+#  define puts(s) {puts(s);fflush(stdout);}
+#endif
+
+
 static pj_bool_t        cmd_echo;
 
@@ -39 +53 @@
     pjsua_enum_buddies(ids, &count);
 
-    if (count == 0)
+    if (count == 0) {
         puts(" -none-");
-    else {
+    } else {
         for (i=0; i<(int)count; ++i) {
             pjsua_buddy_info info;
@@ -1089 +1103 @@
         }
         if (result.nb_result != PJSUA_APP_NO_NB) {
-            if (result.nb_result == -1 || result.nb_result == 0)
+            if (result.nb_result == -1 || result.nb_result == 0) {
                 puts("You can't do that with transfer call!");
-            else {
+            } else {
                 pjsua_buddy_info binfo;
                 pjsua_buddy_get_info(result.nb_result-1, &binfo);
@@ -1670 +1684 @@
 }
 
+
 /*
  * Main "user interface" loop.

pjproject/trunk/tests/pjsua/mod_call.py

@@ -54 +54 @@
 
         # Wait until call is connected in both endpoints
-        time.sleep(0.2)
+        ##time.sleep(0.2)
         caller.expect(const.STATE_CONFIRMED)
         callee.expect(const.STATE_CONFIRMED)
@@ -61 +61 @@
         caller.sync_stdout()
         callee.sync_stdout()
-        time.sleep(0.1)
-        caller.sync_stdout()
-        callee.sync_stdout()
-
-        # Test that media is okay
-        time.sleep(0.3)
+        ##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)
@@ -74 +74 @@
         caller.expect("INVITE sip:")
         callee.expect("INVITE sip:")
+        callee.expect(const.MEDIA_HOLD)
+        caller.expect(const.MEDIA_HOLD)
+        
+        # Synchronize stdout
+        caller.sync_stdout()
+        callee.sync_stdout()
+
+        # Release hold
+        ##time.sleep(0.5)
+        caller.send("v")
+        caller.expect("INVITE sip:")
+        callee.expect("INVITE sip:")
+        callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+        caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+
+        # Synchronize stdout
+        caller.sync_stdout()
+        callee.sync_stdout()
+
+        # Test that media is okay
+        check_media(caller, callee)
+        check_media(callee, caller)
+
+        # Synchronize stdout
+        caller.sync_stdout()
+        callee.sync_stdout()
+
+        # Hold call by callee
+        callee.send("H")
+        callee.expect("INVITE sip:")
+        caller.expect("INVITE sip:")
         caller.expect(const.MEDIA_HOLD)
         callee.expect(const.MEDIA_HOLD)
@@ -82 +113 @@
 
         # Release hold
-        time.sleep(0.5)
-        caller.send("v")
-        caller.expect("INVITE sip:")
-        callee.expect("INVITE sip:")
+        ##time.sleep(0.1)
+        callee.send("v")
+        callee.expect("INVITE sip:")
+        caller.expect("INVITE sip:")
         caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
         callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
@@ -94 +125 @@
 
         # Test that media is okay
-        check_media(caller, callee)
-        check_media(callee, caller)
-
-        # Synchronize stdout
-        caller.sync_stdout()
-        callee.sync_stdout()
-
-        # Hold call by callee
-        callee.send("H")
-        callee.expect("INVITE sip:")
-        caller.expect("INVITE sip:")
-        caller.expect(const.MEDIA_HOLD)
-        callee.expect(const.MEDIA_HOLD)
-        
-        # Synchronize stdout
-        caller.sync_stdout()
-        callee.sync_stdout()
-
-        # Release hold
-        time.sleep(0.1)
-        callee.send("v")
-        callee.expect("INVITE sip:")
-        caller.expect("INVITE sip:")
-        callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
-        caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
-
-        # Synchronize stdout
-        caller.sync_stdout()
-        callee.sync_stdout()
-
-        # Test that media is okay
         # Wait for some time for ICE negotiation
-        time.sleep(0.6)
+        ##time.sleep(0.6)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -145 +145 @@
 
         # Test that media is okay
-        time.sleep(0.1)
+        ##time.sleep(0.1)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -161 +161 @@
 
         # Test that media is okay
-        time.sleep(0.1)
+        ##time.sleep(0.1)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -194 +194 @@
         
         # Test that media is still okay
-        time.sleep(0.1)
+        ##time.sleep(0.1)
         check_media(caller, callee)
         check_media(callee, caller)
@@ -208 +208 @@
         
         # Test that media is still okay
-        time.sleep(0.1)
+        ##time.sleep(0.1)
         check_media(callee, caller)
         check_media(caller, callee)
 
         # Hangup call
-        time.sleep(0.1)
+        ##time.sleep(0.1)
         caller.send("h")
 

pjproject/trunk/tests/pjsua/scripts-call/300_ice_1_1.py

@@ -7 +7 @@
                 "Callee=use ICE, caller=use ICE",
                 [
-                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1", enable_buffer=True),
-                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1", enable_buffer=True)
+                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1"),
+                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1")
                 ]
                 )

pjproject/trunk/tests/pjsua/scripts-call/305_ice_comp_1_2.py

@@ -7 +7 @@
                 "Callee=use ICE, caller=use ICE",
                 [
-                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp", enable_buffer=True),
-                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1", enable_buffer=True)
+                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp"),
+                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1")
                 ]
                 )

pjproject/trunk/tests/pjsua/scripts-call/305_ice_comp_2_1.py

@@ -7 +7 @@
                 "Callee=use ICE, caller=use ICE",
                 [
-                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1", enable_buffer=True),
-                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp", enable_buffer=True)
+                        InstanceParam("callee", "--null-audio --use-ice --max-calls=1"),
+                        InstanceParam("caller", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp")
                 ]
                 )

pjproject/trunk/tests/pjsua/scripts-sendto/200_ice_success_2.py

@@ -32 +32 @@
 sendto_cfg = sip.SendtoCfg( "caller sends only one component", 
                             pjsua_args=args, sdp=sdp, resp_code=200, 
-                            resp_inc=include, resp_exc=exclude,
-                            enable_buffer = True)
+                            resp_inc=include, resp_exc=exclude)
 

pjproject/trunk/tests/pjsua/scripts-sendto/200_ice_success_3.py

@@ -31 +31 @@
 sendto_cfg = sip.SendtoCfg( "caller sends two components without a=rtcp line", 
                             pjsua_args=args, sdp=sdp, resp_code=200, 
-                            resp_inc=include, resp_exc=exclude,
-                            enable_buffer = True)
+                            resp_inc=include, resp_exc=exclude)
 

pjproject/trunk/tests/pjsua/scripts-sendto/200_ice_success_4.py

@@ -31 +31 @@
 sendto_cfg = sip.SendtoCfg( "pjsua with --ice-no-rtcp ignores RTCP things in the SDP", 
                             pjsua_args=args, sdp=sdp, resp_code=200, 
-                            resp_inc=include, resp_exc=exclude,
-                            enable_buffer = True)
+                            resp_inc=include, resp_exc=exclude)