Fixing failure in transport_loop_test(), first in loop_resolve_error(), presumably because there are other loop transport around when the test is run. Solution are: 1) make the test exclusive for now, 2) fix the cleanup of loop transport in other tests. Then there is failure in transport_rt_test(), because it gets loop transport from other test that is being shutdown. Sneakily add pjsip_tpmgr_get_transport_count_by_type() that's useful for debugging.

Author: bennylp

pjlib/src/pjlib-test/fifobuf.c

@@ -137,10 +137,6 @@ static int fifobuf_misc_test()
     void *buffer;
     int i;
 
-    i = fifobuf_size_test();
-    if (i != 0)
-        return i;
-
     pool = pj_pool_create(mem, NULL, SIZE+256, 0, NULL);
     PJ_TEST_NOT_NULL(pool, NULL, return -10);
 

pjsip/include/pjsip/sip_transport.h

@@ -1302,6 +1302,19 @@ PJ_DECL(pj_status_t) pjsip_tpmgr_find_local_addr2(pjsip_tpmgr *tpmgr,
 PJ_DECL(unsigned) pjsip_tpmgr_get_transport_count(pjsip_tpmgr *mgr);
 
 
+/**
+ * Return number of transports of the specified type currently registered to
+ * the transport manager.
+ *
+ * @param mgr       The transport manager.
+ * @param type      Transport type (can be from pjsip_transport_type_e enum)
+ *
+ * @return          Number of transports.
+ */
+PJ_DECL(unsigned) pjsip_tpmgr_get_transport_count_by_type(pjsip_tpmgr *mgr,
+                                                          int type);
+
+
 /**
  * Destroy a transport manager. Normally application doesn't need to call
  * this function directly, since a transport manager will be created and

pjsip/src/pjsip/sip_transport.c

@@ -1897,6 +1897,12 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_find_local_addr( pjsip_tpmgr *tpmgr,
  * manager.
  */
 PJ_DEF(unsigned) pjsip_tpmgr_get_transport_count(pjsip_tpmgr *mgr)
+{
+    return pjsip_tpmgr_get_transport_count_by_type(mgr, -1);
+}
+
+PJ_DEF(unsigned) pjsip_tpmgr_get_transport_count_by_type(pjsip_tpmgr *mgr,
+                                                         int type)
 {
     pj_hash_iterator_t itr_val;
     pj_hash_iterator_t *itr;
@@ -1907,7 +1913,15 @@ PJ_DEF(unsigned) pjsip_tpmgr_get_transport_count(pjsip_tpmgr *mgr)
     itr = pj_hash_first(mgr->table, &itr_val);
     while (itr) {
         transport *tp_entry = (transport *)pj_hash_this(mgr->table, itr);
-        nr_of_transports += (int)pj_list_size(tp_entry);
+        if (type<0) {
+            nr_of_transports += (int)pj_list_size(tp_entry);
+        } else {
+            transport *node = tp_entry->next;
+            for (; node!=tp_entry; node=node->next) {
+                if (tp_entry->tp->key.type==type)
+                    ++nr_of_transports;
+            }
+        }
         itr = pj_hash_next(mgr->table, itr);
     }
 

pjsip/src/test/dns_test.c

@@ -331,7 +331,11 @@ static int test_resolve(const char *title,
                         int port,
                         pjsip_server_addresses *ref)
 {
+    enum {
+        TIMEOUT_SECS = 60
+    };
     pjsip_host_info dest;
+    pj_time_val timeout;
     struct result result;
 
     PJ_LOG(3,(THIS_FILE, " test_resolve(): %s", title));
@@ -343,14 +347,22 @@ static int test_resolve(const char *title,
 
     result.status = 0x12345678;
 
+    pj_gettimeofday(&timeout);
+    timeout.sec += TIMEOUT_SECS;
+
     pjsip_endpt_resolve(endpt, pool, &dest, &result, &cb);
 
     while (result.status == 0x12345678) {
         int i = 0;
         pj_time_val timeout = { 1, 0 };
+        pj_time_val now;
+
         pjsip_endpt_handle_events(endpt, &timeout);
         if (i == 1)
             pj_dns_resolver_dump(pjsip_endpt_get_resolver(endpt), PJ_TRUE);
+
+        pj_gettimeofday(&now);
+        PJ_TEST_TRUE(PJ_TIME_VAL_LT(now, timeout), NULL, return 12345678);
     }
 
     if (result.status != PJ_SUCCESS) {

pjsip/src/test/test.c

@@ -68,6 +68,40 @@ void flush_events(unsigned duration)
     }
 }
 
+/* Wait until there is no loop transport instance */
+pjsip_transport *wait_loop_transport_clear(int secs)
+{
+    pj_time_val timeout;
+    
+    pj_gettimeofday(&timeout);
+    timeout.sec += secs;
+
+    for (;;) {
+        pj_sockaddr_in addr;
+        pjsip_transport *loop = NULL;
+        pj_time_val now;
+        pj_status_t status;
+
+        loop = NULL;
+        pj_bzero(&addr, sizeof(addr));
+        status = pjsip_endpt_acquire_transport(endpt,
+                                               PJSIP_TRANSPORT_LOOP_DGRAM,
+                                               &addr, sizeof(addr), NULL,
+                                               &loop);
+        if (status!=PJ_SUCCESS)
+            return NULL;
+
+        pj_gettimeofday(&now);
+        if (PJ_TIME_VAL_GTE(now, timeout)) {
+            return loop;
+        }
+
+        pjsip_transport_dec_ref(loop);
+        loop = NULL;
+        flush_events(500);
+    }
+}
+
 pj_status_t register_static_modules(pj_size_t *count, pjsip_module **modules)
 {
     PJ_UNUSED_ARG(modules);
@@ -329,14 +363,19 @@ int test_main(int argc, char *argv[])
     UT_ADD_TEST(&test_app.ut_app, transport_udp_test, 0);
 #endif
 
-#if INCLUDE_LOOP_TEST
-    UT_ADD_TEST(&test_app.ut_app, transport_loop_test, 0);
-#endif
-
 #if INCLUDE_TCP_TEST
     UT_ADD_TEST(&test_app.ut_app, transport_tcp_test, 0);
 #endif
 
+    /* Loop test needs to be exclusive, because there must NOT be any other
+     * loop transport otherwise some test will fail (e.g. sending will
+     * fallback to that transport)
+     */
+#if INCLUDE_LOOP_TEST
+    UT_ADD_TEST(&test_app.ut_app, transport_loop_test,
+                PJ_TEST_EXCLUSIVE | PJ_TEST_KEEP_LAST);
+#endif
+
     /*
      * Better be last because it recreates the endpt
      */

pjsip/src/test/test.h

@@ -126,7 +126,7 @@ void app_perror(const char *msg, pj_status_t status);
 int  init_msg_logger(void);
 int  msg_logger_set_enabled(pj_bool_t enabled);
 void flush_events(unsigned duration);
-
+pjsip_transport *wait_loop_transport_clear(int secs);
 
 void report_ival(const char *name, int value, const char *valname, const char *desc);
 void report_sval(const char *name, const char* value, const char *valname, const char *desc);

pjsip/src/test/transport_loop_test.c

@@ -109,6 +109,7 @@ int transport_loop_multi_test(void)
     pj_bzero(loops, sizeof(loops));
     for (i=0; i<N; ++i) {
         PJ_TEST_SUCCESS(pjsip_loop_start(endpt, &loops[i]), NULL, ERR(-10));
+        pjsip_transport_add_ref(loops[i]);
     }
 
     for (i=0; i<N; ++i) {
@@ -158,14 +159,17 @@ int transport_loop_multi_test(void)
 
 on_return:
     for (i=0; i<N; ++i) {
-        if (loops[i])
+        if (loops[i]) {
+            /* Order must be shutdown then dec_ref so it gets destroyed */
             pjsip_transport_shutdown(loops[i]);
+            pjsip_transport_dec_ref(loops[i]);
+        }
     }
     if (loop_tester_mod.id != -1) {
         pjsip_endpt_unregister_module(endpt, &loop_tester_mod);
     }
     /* let transport destroy run its course */
-    flush_events(100);
+    flush_events(500);
     return rc;
 #undef ERR
 }
@@ -184,7 +188,7 @@ static void send_cb(pjsip_send_state *st, pj_ssize_t sent, pj_bool_t *cont)
     }
 }
 
-static int loop_resolve_error()
+static int loop_resolve_error(pj_bool_t disable_no_selector)
 {
     pjsip_transport *loop = NULL;
     pj_sockaddr_in addr;
@@ -206,9 +210,12 @@ static int loop_resolve_error()
         return -210;
     }
 
-    url = pj_str("sip:bob@unresolved-host");
+    url = pj_str("sip:bob@unresolved-host;transport=loop-dgram");
 
     for (i=0; i<2; ++i) {
+        if (i==0 && disable_no_selector)
+            continue;
+
         /* variant a: without tp_selector */
         status = pjsip_endpt_create_request( endpt, &pjsip_options_method,
                                             &url, &url, &url, NULL, NULL, -1, 
@@ -235,14 +242,20 @@ static int loop_resolve_error()
             /* Success! (we're expecting error and got immediate error)*/
             loop_resolve_status = 0;
         } else {
-            flush_events(500);
+            unsigned j;
+
+            for (j=0; j<40 && loop_resolve_status==PJ_EPENDING; ++j)
+                flush_events(500);
+
             if (loop_resolve_status!=PJ_EPENDING && loop_resolve_status!=PJ_SUCCESS) {
                 /* Success! (we're expecting error in callback)*/
                 //PJ_PERROR(3, (THIS_FILE, loop_resolve_status, 
                 //              "   correctly got error"));
                 loop_resolve_status = 0;
             } else {
-                PJ_LOG(3,(THIS_FILE, "   error: expecting error but status=%d", status));
+                PJ_LOG(3,(THIS_FILE, 
+                          "   error (variant %d): expecting error but loop_resolve_status=%d",
+                          i, loop_resolve_status));
                 loop_resolve_status = -240;
                 goto on_return;
             }
@@ -255,23 +268,45 @@ static int loop_resolve_error()
     return loop_resolve_status;
 }
 
-static int datagram_loop_test()
+int transport_loop_test()
 {
     enum { LOOP = 8 };
     pjsip_transport *loop = NULL;
     char host_port_transport[64];
+    pj_bool_t disable_no_selector = PJ_FALSE;
     int i, pkt_lost;
     int status;
     long ref_cnt;
     int rtt[LOOP], min_rtt;
 
-    PJ_LOG(3,(THIS_FILE, "testing datagram loop transport"));
 
-    /* Test acquire transport. */
-    PJ_TEST_SUCCESS(pjsip_loop_start(endpt, &loop), NULL, return -10);
-    pjsip_transport_add_ref(loop);
-
-    pjsip_loop_set_failure(loop, 0, 0);
+    PJ_LOG(3,(THIS_FILE, "  Loop transport count: %d",
+                pjsip_tpmgr_get_transport_count_by_type(
+                pjsip_endpt_get_tpmgr(endpt),
+                PJSIP_TRANSPORT_LOOP_DGRAM)));
+                
+    /* if there is another transport, wait sometime until it's gone */
+    loop = wait_loop_transport_clear(10);
+
+    if (loop) {
+        /* We are not supposed to have another instance of loop transport, but
+         * we found one. If there are more than one, test will fail. Otherwise
+         * test should succeed
+         */
+        PJ_LOG(2,(THIS_FILE,
+                  "Warning: found %d loop transport instances",
+                  pjsip_tpmgr_get_transport_count_by_type(
+                    pjsip_endpt_get_tpmgr(endpt),
+                    PJSIP_TRANSPORT_LOOP_DGRAM)));
+        disable_no_selector = PJ_TRUE;
+        pjsip_loop_set_discard(loop, 0, NULL);
+        pjsip_loop_set_failure(loop, 0, NULL);
+        pjsip_loop_set_delay(loop, 0);
+    } else {
+        PJ_TEST_EQ(loop, NULL, NULL, return -2);
+        PJ_TEST_SUCCESS(pjsip_loop_start(endpt, &loop), NULL, return -3);
+        pjsip_transport_add_ref(loop);
+    }
 
     pj_ansi_snprintf(host_port_transport, sizeof(host_port_transport),
                      "%.*s:%d;transport=loop-dgram",
@@ -282,6 +317,11 @@ static int datagram_loop_test()
     /* Get initial reference counter */
     ref_cnt = pj_atomic_get(loop->ref_cnt);
 
+    /* Resolve error */
+    status = loop_resolve_error(disable_no_selector);
+    if (status)
+        goto on_return;
+
     /* Test basic transport attributes */
     status = generic_transport_test(loop);
     if (status != PJ_SUCCESS)
@@ -295,11 +335,6 @@ static int datagram_loop_test()
             goto on_return;
     }
 
-    /* Resolve error */
-    status = loop_resolve_error();
-    if (status)
-        goto on_return;
-
     min_rtt = 0xFFFFFFF;
     for (i=0; i<LOOP; ++i)
         if (rtt[i] < min_rtt) min_rtt = rtt[i];
@@ -311,16 +346,15 @@ static int datagram_loop_test()
 
 
     /* Multi-threaded round-trip test. */
+    pjsip_loop_set_discard(loop, 0, NULL);
+    pjsip_loop_set_failure(loop, 0, NULL);
+    pjsip_loop_set_delay(loop, 0);
     status = transport_rt_test(PJSIP_TRANSPORT_LOOP_DGRAM, loop, 
                                "130.0.0.1;transport=loop-dgram", &pkt_lost);
     if (status != 0)
         goto on_return;
 
-    if (pkt_lost != 0) {
-        PJ_LOG(3,(THIS_FILE, "   error: %d packet(s) was lost", pkt_lost));
-        status = -40;
-        goto on_return;
-    }
+    PJ_TEST_EQ(pkt_lost, 0, NULL, { status = -40; goto on_return;});
 
     /* Put delay. */
     PJ_LOG(3,(THIS_FILE,"  setting network delay to 10 ms"));
@@ -333,11 +367,7 @@ static int datagram_loop_test()
     if (status != 0)
         goto on_return;
 
-    if (pkt_lost != 0) {
-        PJ_LOG(3,(THIS_FILE, "   error: %d packet(s) was lost", pkt_lost));
-        status = -50;
-        goto on_return;
-    }
+    PJ_TEST_EQ(pkt_lost, 0, NULL, { status = -50; goto on_return;});
 
     /* Restore delay. */
     pjsip_loop_set_delay(loop, 0);
@@ -357,14 +387,3 @@ static int datagram_loop_test()
     pjsip_transport_dec_ref(loop);
     return status;
 }
-
-int transport_loop_test(void)
-{
-    int status;
-
-    status = datagram_loop_test();
-    if (status != 0)
-        return status;
-
-    return 0;
-}