Changeset 708

Timestamp:

Sep 12, 2006 11:49:16 PM (18 years ago)

Author:

bennylp

Message:

Fixed mutex leaking in Linux: pj_mutex_destroy() will fail to destroy the mutex if the mutex is currently being held. Unfortunately it is quite common in the libraries to acquire the mutex first before destroying it, causing mutexes to leak. The solution is to retry unlocking/destroying the mutex several times (currently 4) while pthread_mutex_destroy() returns EBUSY

File:

• pjproject/trunk/pjlib/src/pj/os_core_unix.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/os_core_unix.c

@@ -1102 +1102 @@
 PJ_DEF(pj_status_t) pj_mutex_destroy(pj_mutex_t *mutex)
 {
+    enum { RETRY = 4 };
     int status;
+    unsigned retry;
 
     PJ_CHECK_STACK();
@@ -1110 +1112 @@
     PJ_LOG(6,(mutex->obj_name, "Mutex destroyed by thread %s",
                                pj_thread_this()->obj_name));
-    status = pthread_mutex_destroy( &mutex->mutex );
+
+    for (retry=0; retry<RETRY; ++retry) {
+        status = pthread_mutex_destroy( &mutex->mutex );
+        if (status == PJ_SUCCESS)
+            break;
+        else if (retry<RETRY-1 && status == EBUSY)
+            pthread_mutex_unlock(&mutex->mutex);
+    }
+
     if (status == 0)
         return PJ_SUCCESS;
-    else
+    else {
+        pj_assert(!"Error destroying pthread_mutex");
         return PJ_RETURN_OS_ERROR(status);
+    }
 #else
     pj_assert( mutex == (pj_mutex_t*)1 );