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

Timestamp:

Feb 13, 2008 3:17:28 PM (16 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_udp.c (modified) (12 diffs)

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

@@ -126 +126 @@
  * data between two sockets.
  */ 
-static int compliance_test(void)
+static int compliance_test(pj_bool_t allow_concur)
 {
     pj_sock_t ssock=-1, csock=-1;
@@ -177 +177 @@
     if (rc != PJ_SUCCESS) {
         status=-20; goto on_error;
+    }
+
+    // Set concurrency
+    TRACE_("set concurrency...");
+    rc = pj_ioqueue_set_default_concurrency(ioque, allow_concur);
+    if (rc != PJ_SUCCESS) {
+        status=-21; goto on_error;
     }
 
@@ -352 +359 @@
  * closed.
  */ 
-static int unregister_test(void)
+static int unregister_test(pj_bool_t allow_concur)
 {
     enum { RPORT = 50000, SPORT = 50001 };
@@ -382 +389 @@
     }
 
+    // Set concurrency
+    TRACE_("set concurrency...");
+    status = pj_ioqueue_set_default_concurrency(ioqueue, allow_concur);
+    if (status != PJ_SUCCESS) {
+        return -112;
+    }
+
     /* Create sender socket */
     status = app_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, SPORT, &ssock);
@@ -513 +527 @@
  * of sockets to the ioqueue.
  */
-static int many_handles_test(void)
+static int many_handles_test(pj_bool_t allow_concur)
 {
     enum { MAX = PJ_IOQUEUE_MAX_HANDLES };
@@ -538 +552 @@
         app_perror("...error in pj_ioqueue_create", rc);
         return -10;
+    }
+
+    // Set concurrency
+    rc = pj_ioqueue_set_default_concurrency(ioqueue, allow_concur);
+    if (rc != PJ_SUCCESS) {
+        return -11;
     }
 
@@ -601 +621 @@
  * Benchmarking IOQueue
  */
-static int bench_test(int bufsize, int inactive_sock_count)
+static int bench_test(pj_bool_t allow_concur, int bufsize, 
+                      int inactive_sock_count)
 {
     pj_sock_t ssock=-1, csock=-1;
@@ -649 +670 @@
     if (rc != PJ_SUCCESS) {
         app_perror("...error: pj_ioqueue_create()", rc);
+        goto on_error;
+    }
+
+    // Set concurrency
+    rc = pj_ioqueue_set_default_concurrency(ioque, allow_concur);
+    if (rc != PJ_SUCCESS) {
+        app_perror("...error: pj_ioqueue_set_default_concurrency()", rc);
         goto on_error;
     }
@@ -840 +868 @@
 }
 
-int udp_ioqueue_test()
+static int udp_ioqueue_test_imp(pj_bool_t allow_concur)
 {
     int status;
     int bufsize, sock_count;
 
+    PJ_LOG(3,(THIS_FILE, "..testing with concurency=%d", allow_concur));
+
     //goto pass1;
 
     PJ_LOG(3, (THIS_FILE, "...compliance test (%s)", pj_ioqueue_name()));
-    if ((status=compliance_test()) != 0) {
+    if ((status=compliance_test(allow_concur)) != 0) {
         return status;
     }
@@ -855 +885 @@
 
     PJ_LOG(3, (THIS_FILE, "...unregister test (%s)", pj_ioqueue_name()));
-    if ((status=unregister_test()) != 0) {
+    if ((status=unregister_test(allow_concur)) != 0) {
         return status;
     }
     PJ_LOG(3, (THIS_FILE, "....unregister test ok"));
 
-    if ((status=many_handles_test()) != 0) {
+    if ((status=many_handles_test(allow_concur)) != 0) {
         return status;
     }
@@ -880 +910 @@
 
     for (bufsize=BUF_MIN_SIZE; bufsize <= BUF_MAX_SIZE; bufsize *= 2) {
-        if ((status=bench_test(bufsize, SOCK_INACTIVE_MIN)) != 0)
+        if ((status=bench_test(allow_concur, bufsize, SOCK_INACTIVE_MIN)) != 0)
             return status;
     }
@@ -890 +920 @@
     {
         //PJ_LOG(3,(THIS_FILE, "...testing with %d fds", sock_count));
-        if ((status=bench_test(bufsize, sock_count-2)) != 0)
+        if ((status=bench_test(allow_concur, bufsize, sock_count-2)) != 0)
             return status;
     }
+    return 0;
+}
+
+int udp_ioqueue_test()
+{
+    int rc;
+
+    rc = udp_ioqueue_test_imp(PJ_TRUE);
+    if (rc != 0)
+        return rc;
+
+    rc = udp_ioqueue_test_imp(PJ_FALSE);
+    if (rc != 0)
+        return rc;
+
     return 0;
 }