Changeset 5668 for pjproject

Timestamp:

Sep 29, 2017 2:43:05 AM (7 years ago)

Author:

ming

Message:

Fix #2048: Add compile time option to disable sleep in sip endpoint's handle events on ioqueue polling's error

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip/sip_endpoint.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -377 +377 @@
 #endif
 
+/**
+ * Specify if #pjsip_endpt_handle_events() should sleep if ioqueue poll
+ * returns error.
+ *
+ * Default is 1 (yes).
+ */
+
+#ifndef PJSIP_HANDLE_EVENTS_HAS_SLEEP_ON_ERR
+#   define PJSIP_HANDLE_EVENTS_HAS_SLEEP_ON_ERR     1
+#endif
 
 /**

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -35 +35 @@
 #include <pj/errno.h>
 #include <pj/lock.h>
+#include <pj/math.h>
 
 #define PJSIP_EX_NO_MEMORY  pj_NO_MEMORY_EXCEPTION()
@@ -700 +701 @@
                                                unsigned *p_count)
 {
+    enum { MAX_TIMEOUT_ON_ERR = 10 };
     /* timeout is 'out' var. This just to make compiler happy. */
     pj_time_val timeout = { 0, 0};
@@ -743 +745 @@
         if (c < 0) {
             pj_status_t err = pj_get_netos_error();
-            pj_thread_sleep(PJ_TIME_VAL_MSEC(timeout));
+#if PJSIP_HANDLE_EVENTS_HAS_SLEEP_ON_ERR
+            unsigned msec = PJ_TIME_VAL_MSEC(timeout);
+            pj_thread_sleep(PJ_MIN(msec, MAX_TIMEOUT_ON_ERR));
+#endif
+
             if (p_count)
                 *p_count = count;