Changeset 1789 for pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.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_tcp.c (modified) (9 diffs)

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

@@ -233 +233 @@
  * Compliance test for success scenario.
  */
-static int compliance_test_0(void)
+static int compliance_test_0(pj_bool_t allow_concur)
 {
     pj_sock_t ssock=-1, csock0=-1, csock1=-1;
@@ -291 +291 @@
         app_perror("...ERROR in pj_ioqueue_create()", rc);
         status=-20; goto on_error;
+    }
+
+    // Concurrency
+    rc = pj_ioqueue_set_default_concurrency(ioque, allow_concur);
+    if (rc != PJ_SUCCESS) {
+        app_perror("...ERROR in pj_ioqueue_set_default_concurrency()", rc);
+        status=-21; goto on_error;
     }
 
@@ -459 +466 @@
  * In this case, the client connects to a non-existant service.
  */
-static int compliance_test_1(void)
+static int compliance_test_1(pj_bool_t allow_concur)
 {
     pj_sock_t csock1=PJ_INVALID_SOCKET;
@@ -478 +485 @@
     if (!ioque) {
         status=-20; goto on_error;
+    }
+
+    // Concurrency
+    rc = pj_ioqueue_set_default_concurrency(ioque, allow_concur);
+    if (rc != PJ_SUCCESS) {
+        status=-21; goto on_error;
     }
 
@@ -582 +595 @@
  * Repeated connect/accept on the same listener socket.
  */
-static int compliance_test_2(void)
+static int compliance_test_2(pj_bool_t allow_concur)
 {
 #if defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
@@ -648 +661 @@
     }
 
+
+    // Concurrency
+    rc = pj_ioqueue_set_default_concurrency(ioque, allow_concur);
+    if (rc != PJ_SUCCESS) {
+        app_perror("...ERROR in pj_ioqueue_set_default_concurrency()", rc);
+        return -11;
+    }
 
     // Allocate buffers for send and receive.
@@ -888 +908 @@
 
 
-int tcp_ioqueue_test()
+static int tcp_ioqueue_test_impl(pj_bool_t allow_concur)
 {
     int status;
+
+    PJ_LOG(3,(THIS_FILE, "..testing with concurency=%d", allow_concur));
 
     PJ_LOG(3, (THIS_FILE, "..%s compliance test 0 (success scenario)",
                pj_ioqueue_name()));
-    if ((status=compliance_test_0()) != 0) {
+    if ((status=compliance_test_0(allow_concur)) != 0) {
         PJ_LOG(1, (THIS_FILE, "....FAILED (status=%d)\n", status));
         return status;
@@ -900 +922 @@
     PJ_LOG(3, (THIS_FILE, "..%s compliance test 1 (failed scenario)",
                pj_ioqueue_name()));
-    if ((status=compliance_test_1()) != 0) {
+    if ((status=compliance_test_1(allow_concur)) != 0) {
         PJ_LOG(1, (THIS_FILE, "....FAILED (status=%d)\n", status));
         return status;
@@ -907 +929 @@
     PJ_LOG(3, (THIS_FILE, "..%s compliance test 2 (repeated accept)",
                pj_ioqueue_name()));
-    if ((status=compliance_test_2()) != 0) {
+    if ((status=compliance_test_2(allow_concur)) != 0) {
         PJ_LOG(1, (THIS_FILE, "....FAILED (status=%d)\n", status));
         return status;
     }
+
+    return 0;
+}
+
+int tcp_ioqueue_test()
+{
+    int rc;
+
+    rc = tcp_ioqueue_test_impl(PJ_TRUE);
+    if (rc != 0)
+        return rc;
+
+    rc = tcp_ioqueue_test_impl(PJ_FALSE);
+    if (rc != 0)
+        return rc;
 
     return 0;