Changeset 1789 for pjproject/trunk/pjlib/src/pjlib-test/ioq_perf.c

Timestamp:

Feb 13, 2008 3:17:28 PM (17 years ago)

Author:

bennylp

Message:

Ticket #474: option in ioqueue to control concurrency (to allow/disallow simultaneous/multiple callback calls)

File:

• pjproject/trunk/pjlib/src/pjlib-test/ioq_perf.c (modified) (6 diffs)

pjproject/trunk/pjlib/src/pjlib-test/ioq_perf.c

@@ -222 +222 @@
  *    period of time.
  */
-static int perform_test(int sock_type, const char *type_name,
+static int perform_test(pj_bool_t allow_concur,
+                        int sock_type, const char *type_name,
                         unsigned thread_cnt, unsigned sockpair_cnt,
                         pj_size_t buffer_size, 
@@ -261 +262 @@
     }
 
+    rc = pj_ioqueue_set_default_concurrency(ioqueue, allow_concur);
+    if (rc != PJ_SUCCESS) {
+        app_perror("...error: pj_ioqueue_set_default_concurrency()", rc);
+        return -16;
+    }
+
     /* Initialize each producer-consumer pair. */
     for (i=0; i<sockpair_cnt; ++i) {
@@ -438 +445 @@
 }
 
-/*
- * main test entry.
- */
-int ioqueue_perf_test(void)
+static int ioqueue_perf_test_imp(pj_bool_t allow_concur)
 {
     enum { BUF_SIZE = 512 };
@@ -501 +505 @@
 
     PJ_LOG(3,(THIS_FILE, "   Benchmarking %s ioqueue:", pj_ioqueue_name()));
+    PJ_LOG(3,(THIS_FILE, "   Testing with concurency=%d", allow_concur));
     PJ_LOG(3,(THIS_FILE, "   ======================================="));
     PJ_LOG(3,(THIS_FILE, "   Type  Threads  Skt.Pairs      Bandwidth"));
@@ -509 +514 @@
         pj_size_t bandwidth;
 
-        rc = perform_test(test_param[i].type, 
+        rc = perform_test(allow_concur,
+                          test_param[i].type, 
                           test_param[i].type_name,
                           test_param[i].thread_cnt, 
@@ -538 +544 @@
 }
 
+/*
+ * main test entry.
+ */
+int ioqueue_perf_test(void)
+{
+    int rc;
+
+    rc = ioqueue_perf_test_imp(PJ_TRUE);
+    if (rc != 0)
+        return rc;
+
+    rc = ioqueue_perf_test_imp(PJ_FALSE);
+    if (rc != 0)
+        return rc;
+
+    return 0;
+}
+
 #else
 /* To prevent warning about "translation unit is empty"