Changeset 581 for pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

Timestamp:

Jul 3, 2006 2:18:17 PM (17 years ago)

Author:

bennylp

Message:

Fixed minor bug in pool_caching.c that prevent pool from being reused if the capacity has changed when the pool is released

File:

• pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c (modified) (6 diffs)

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

@@ -89 +89 @@
 
 
+#if defined(PJSIP_SAFE_MODULE) && PJSIP_SAFE_MODULE!=0
+#   define LOCK_MODULE_ACCESS(ept)      pj_rwmutex_lock_read(ept->mod_mutex)
+#   define UNLOCK_MODULE_ACCESS(ept)    pj_rwmutex_unlock_read(ept->mod_mutex)
+#else
+#   define LOCK_MODULE_ACCESS(endpt)
+#   define UNLOCK_MODULE_ACCESS(endpt)
+#endif
+
+
 
 /*
@@ -582 +591 @@
     PJ_LOG(6, (THIS_FILE, "Releasing pool %s", pj_pool_getobjname(pool)));
 
-    pj_mutex_lock(endpt->mutex);
+    /* Don't need to acquire mutex since pool factory is thread safe
+       pj_mutex_lock(endpt->mutex);
+     */
     pj_pool_release( pool );
+
+    /*
     pj_mutex_unlock(endpt->mutex);
+     */
 }
 
@@ -777 +791 @@
 
     /* Distribute to modules, starting from modules with highest priority */
-    pj_rwmutex_lock_read(endpt->mod_mutex);
+    LOCK_MODULE_ACCESS(endpt);
 
     if (msg->type == PJSIP_REQUEST_MSG) {
@@ -824 +838 @@
     }
 
-    pj_rwmutex_unlock_read(endpt->mod_mutex);
+    UNLOCK_MODULE_ACCESS(endpt);
 
     /* Must clear mod_data before returning rdata to transport, since
@@ -843 +857 @@
 
     /* Distribute to modules, starting from modules with LOWEST priority */
-    pj_rwmutex_lock_read(endpt->mod_mutex);
+    LOCK_MODULE_ACCESS(endpt);
 
     mod = endpt->module_list.prev;
@@ -865 +879 @@
     }
 
-    pj_rwmutex_unlock_read(endpt->mod_mutex);
+    UNLOCK_MODULE_ACCESS(endpt);
 
     return status;