Changeset 3304 for pjproject/trunk

Timestamp:

Sep 7, 2010 5:12:02 AM (14 years ago)

Author:

ming

Message:

Fixed #1117: Configurable PJSUA-LIB lock timeout

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)

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

@@ -315 +315 @@
 #ifndef PJSUA_ADD_ICE_TAGS
 #   define PJSUA_ADD_ICE_TAGS           1
+#endif
+
+/**
+ * Timeout value used to acquire mutex lock on a particular call.
+ *
+ * Default: 2000 ms
+ */
+#ifndef PJSUA_ACQUIRE_CALL_TIMEOUT
+#   define PJSUA_ACQUIRE_CALL_TIMEOUT 2000
 #endif
 

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

@@ -1131 +1131 @@
                                 pjsip_dialog **p_dlg)
 {
-    enum { MAX_RETRY=50 };
     unsigned retry;
     pjsua_call *call = NULL;
     pj_bool_t has_pjsua_lock = PJ_FALSE;
     pj_status_t status = PJ_SUCCESS;
-
-    for (retry=0; retry<MAX_RETRY; ++retry) {
+    pj_time_val time_start, timeout;
+
+    pj_gettimeofday(&time_start);
+    timeout.msec = PJSUA_ACQUIRE_CALL_TIMEOUT;
+    pj_time_val_normalize(&timeout);
+
+    for (retry=0; ; ++retry) {
+
+        if (retry % 10 == 9) {
+            pj_time_val dtime;
+
+            pj_gettimeofday(&dtime);
+            PJ_TIME_VAL_SUB(dtime, time_start);
+            if (!PJ_TIME_VAL_LT(dtime, timeout))
+                break;
+        }
         
         has_pjsua_lock = PJ_FALSE;