Changeset 4359 for pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c

Timestamp:

Feb 21, 2013 11:18:36 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1616: Implementation of Group lock and other foundation in PJLIB for fixing synchronization issues

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c (modified) (7 diffs)

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

@@ -263 +263 @@
         key = PJ_POOL_ALLOC_T(pool, pj_ioqueue_key_t);
         key->ref_count = 0;
-        rc = pj_mutex_create_recursive(pool, NULL, &key->mutex);
+        rc = pj_lock_create_recursive_mutex(pool, NULL, &key->lock);
         if (rc != PJ_SUCCESS) {
             key = ioqueue->free_list.next;
             while (key != &ioqueue->free_list) {
-                pj_mutex_destroy(key->mutex);
+                pj_lock_destroy(key->lock);
                 key = key->next;
             }
@@ -324 +324 @@
     key = ioqueue->active_list.next;
     while (key != &ioqueue->active_list) {
-        pj_mutex_destroy(key->mutex);
+        pj_lock_destroy(key->lock);
         key = key->next;
     }
@@ -330 +330 @@
     key = ioqueue->closing_list.next;
     while (key != &ioqueue->closing_list) {
-        pj_mutex_destroy(key->mutex);
+        pj_lock_destroy(key->lock);
         key = key->next;
     }
@@ -336 +336 @@
     key = ioqueue->free_list.next;
     while (key != &ioqueue->free_list) {
-        pj_mutex_destroy(key->mutex);
+        pj_lock_destroy(key->lock);
         key = key->next;
     }
@@ -423 +423 @@
     if (status < 0) {
         rc = pj_get_os_error();
-        pj_mutex_destroy(key->mutex);
+        pj_lock_destroy(key->lock);
         key = NULL;
         TRACE_((THIS_FILE, 
@@ -498 +498 @@
      * deadlock.
      */
-    pj_mutex_lock(key->mutex);
+    pj_lock_acquire(key->lock);
 
     /* Also lock ioqueue */
@@ -532 +532 @@
 
     /* Done. */
-    pj_mutex_unlock(key->mutex);
+    pj_lock_release(key->lock);
 #else
-    pj_mutex_destroy(key->mutex);
+    pj_lock_destroy(key->lock);
 #endif