Changeset 5065 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

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.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c (modified) (4 diffs)

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.