Changeset 4360 for pjproject/trunk/pjnath/src/pjnath-test/test.c

Timestamp:

Feb 21, 2013 11:26:35 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1617: major synchronization fixes in PJNATH with incorporation of group lock to avoid deadlock and crashes due to race conditions

File:

• pjproject/trunk/pjnath/src/pjnath-test/test.c (modified) (7 diffs)

pjproject/trunk/pjnath/src/pjnath-test/test.c

@@ -35 +35 @@
     pj_ioqueue_t *ioqueue;
     pj_timer_heap_t *timer_heap;
+    pj_lock_t *lock;
     pj_status_t status;
 
@@ -50 +51 @@
     }
 
+    pj_lock_create_recursive_mutex(pool, NULL, &lock);
+    pj_timer_heap_set_lock(timer_heap, lock, PJ_TRUE);
+
     pj_stun_config_init(stun_cfg, mem, 0, ioqueue, timer_heap);
 
@@ -106 +110 @@
     st->timer_cnt = pj_timer_heap_count(cfg->timer_heap);
     
-    cp = (pj_caching_pool*)mem;
+    cp = (pj_caching_pool*)cfg->pf;
     st->pool_used_cnt = cp->used_count;
 }
@@ -121 +125 @@
         PJ_LOG(3,("", "    error: possibly leaking timer"));
         rc |= ERR_TIMER_LEAK;
+
+#if PJ_TIMER_DEBUG
+        pj_timer_heap_dump(cfg->timer_heap);
+#endif
     }
 
@@ -149 +157 @@
                       PJ_LOG_HAS_MICRO_SEC;
 
+pj_log_func *orig_log_func;
+FILE *log_file;
+
+static void test_log_func(int level, const char *data, int len)
+{
+    if (log_file) {
+        fwrite(data, len, 1, log_file);
+    }
+    if (level <= 3)
+        orig_log_func(level, data, len);
+}
+
 static int test_inner(void)
 {
@@ -159 +179 @@
     pj_log_set_level(3);
     pj_log_set_decor(param_log_decor);
+#elif 1
+    log_file = fopen("pjnath-test.log", "wt");
+    pj_log_set_level(5);
+    orig_log_func = pj_log_get_log_func();
+    pj_log_set_log_func(&test_log_func);
 #endif
 
@@ -190 +215 @@
 #endif
 
+#if INCLUDE_CONCUR_TEST
+    DO_TEST(concur_test());
+#endif
+
 on_return:
+    if (log_file)
+        fclose(log_file);
     return rc;
 }