Changeset 5712

Timestamp:

Dec 12, 2017 7:44:09 AM (7 years ago)

Author:

nanang

Message:

Fixed #2074: Introduced compile time setting PJSUA_SEPARATE_WORKER_FOR_TIMER to allow separate polling for timer events and network events.

Location:

pjproject/trunk

Files:

• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -411 +411 @@
     #define PJSIP_MAX_DIALOG_COUNT              31
     #define PJSUA_MAX_CALLS                     4
+
+    /* Separate worker thread for timer and ioqueue */
+    #define PJSUA_SEPARATE_WORKER_FOR_TIMER     1
 
     /* Other pjsua settings */

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -349 +349 @@
 #ifndef PJSUA_VID_REQ_KEYFRAME_INTERVAL
 #   define PJSUA_VID_REQ_KEYFRAME_INTERVAL      3000
+#endif
+
+
+/**
+ * Specify whether timer heap events will be polled by a separate worker
+ * thread. If this is set/enabled, a worker thread will be dedicated to
+ * poll timer heap events only, and the rest worker thread(s) will poll
+ * ioqueue/network events only.
+ *
+ * Note that if worker thread count setting (i.e: pjsua_config.thread_cnt)
+ * is set to zero, this setting will be ignored.
+ *
+ * Default: 0 (disabled)
+ */
+#ifndef PJSUA_SEPARATE_WORKER_FOR_TIMER
+#   define PJSUA_SEPARATE_WORKER_FOR_TIMER      0
 #endif
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -104 +104 @@
 
     cfg->max_calls = ((PJSUA_MAX_CALLS) < 4) ? (PJSUA_MAX_CALLS) : 4;
-    cfg->thread_cnt = 1;
+    cfg->thread_cnt = PJSUA_SEPARATE_WORKER_FOR_TIMER? 2 : 1;
     cfg->nat_type_in_sdp = 1;
     cfg->stun_ignore_failure = PJ_TRUE;
@@ -710 +710 @@
 }
 
+/* Timer heap worker thread function. */
+static int worker_thread_timer(void *arg)
+{
+    pj_timer_heap_t *th;
+
+    PJ_UNUSED_ARG(arg);
+
+    th = pjsip_endpt_get_timer_heap(pjsua_var.endpt);
+    while (!pjsua_var.thread_quit_flag) {
+        pj_time_val timeout = {0, 0};
+        int c;
+
+        c = pj_timer_heap_poll(th, &timeout);
+        if (c == 0) {
+            /* Sleep if no event */
+            enum { MAX_SLEEP_MS = 100 };
+            if (PJ_TIME_VAL_MSEC(timeout) < MAX_SLEEP_MS)
+                pj_thread_sleep(PJ_TIME_VAL_MSEC(timeout));
+            else
+                pj_thread_sleep(MAX_SLEEP_MS);
+        }
+    }
+    return 0;
+}
+
+/* Ioqueue worker thread function. */
+static int worker_thread_ioqueue(void *arg)
+{
+    pj_ioqueue_t *ioq;
+
+    PJ_UNUSED_ARG(arg);
+
+    ioq = pjsip_endpt_get_ioqueue(pjsua_var.endpt);
+    while (!pjsua_var.thread_quit_flag) {
+        pj_time_val timeout = {0, 100};
+        pj_ioqueue_poll(ioq, &timeout);
+    }
+    return 0;
+}
+
 
 PJ_DEF(void) pjsua_stop_worker_threads(void)
@@ -1113 +1153 @@
             pjsua_var.ua_cfg.thread_cnt = PJ_ARRAY_SIZE(pjsua_var.thread);
 
+#if PJSUA_SEPARATE_WORKER_FOR_TIMER
+        if (pjsua_var.ua_cfg.thread_cnt < 2)
+            pjsua_var.ua_cfg.thread_cnt = 2;
+#endif
+
         for (ii=0; ii<pjsua_var.ua_cfg.thread_cnt; ++ii) {
-            char thread_name[16];
-            pj_ansi_snprintf(thread_name, 16, "pjsua_%d", ii);
-            status = pj_thread_create(pjsua_var.pool, thread_name, &worker_thread,
+            char tname[16];
+            
+            pj_ansi_snprintf(tname, sizeof(tname), "pjsua_%d", ii);
+
+#if PJSUA_SEPARATE_WORKER_FOR_TIMER
+            if (ii == 0) {
+                status = pj_thread_create(pjsua_var.pool, tname,
+                                          &worker_thread_timer,
+                                          NULL, 0, 0, &pjsua_var.thread[ii]);
+            } else {
+                status = pj_thread_create(pjsua_var.pool, tname,
+                                          &worker_thread_ioqueue,
+                                          NULL, 0, 0, &pjsua_var.thread[ii]);
+            }
+#else
+            status = pj_thread_create(pjsua_var.pool, tname, &worker_thread,
                                       NULL, 0, 0, &pjsua_var.thread[ii]);
+#endif
             if (status != PJ_SUCCESS)
                 goto on_error;