Changeset 4434

Timestamp:

Mar 11, 2013 5:27:23 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1638: more group lock fixes, this time for ioqueue_epoll

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c (modified) (9 diffs, 1 prop)

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

@@ -36 +36 @@
 #include <pj/sock.h>
 #include <pj/compat/socket.h>
+#include <pj/rand.h>
 
 #if !defined(PJ_LINUX_KERNEL) || PJ_LINUX_KERNEL==0
@@ -350 +351 @@
  * Register a socket to ioqueue.
  */
-PJ_DEF(pj_status_t) pj_ioqueue_register_sock( pj_pool_t *pool,
+PJ_DEF(pj_status_t) pj_ioqueue_register_sock2(pj_pool_t *pool,
                                               pj_ioqueue_t *ioqueue,
                                               pj_sock_t sock,
+                                              pj_grp_lock_t *grp_lock,
                                               void *user_data,
                                               const pj_ioqueue_callback *cb,
@@ -404 +406 @@
 #endif
 
-    rc = ioqueue_init_key(pool, ioqueue, key, sock, user_data, cb);
+    rc = ioqueue_init_key(pool, ioqueue, key, sock, grp_lock, user_data, cb);
     if (rc != PJ_SUCCESS) {
         key = NULL;
@@ -438 +440 @@
 
 on_return:
+    if (rc != PJ_SUCCESS) {
+        if (key->grp_lock)
+            pj_grp_lock_dec_ref_dbg(key->grp_lock, "ioqueue", 0);
+    }
     *p_key = key;
     pj_lock_release(ioqueue->lock);
     
     return rc;
+}
+
+PJ_DEF(pj_status_t) pj_ioqueue_register_sock( pj_pool_t *pool,
+                                              pj_ioqueue_t *ioqueue,
+                                              pj_sock_t sock,
+                                              void *user_data,
+                                              const pj_ioqueue_callback *cb,
+                                              pj_ioqueue_key_t **p_key)
+{
+    return pj_ioqueue_register_sock2(pool, ioqueue, sock, NULL, user_data,
+                                     cb, p_key);
 }
 
@@ -498 +515 @@
      * deadlock.
      */
-    pj_lock_acquire(key->lock);
+    pj_ioqueue_lock_key(key);
 
     /* Also lock ioqueue */
@@ -532 +549 @@
 
     /* Done. */
-    pj_lock_release(key->lock);
+    if (key->grp_lock) {
+        /* just dec_ref and unlock. we will set grp_lock to NULL
+         * elsewhere */
+        pj_grp_lock_t *grp_lock = key->grp_lock;
+        // Don't set grp_lock to NULL otherwise the other thread
+        // will crash. Just leave it as dangling pointer, but this
+        // should be safe
+        //key->grp_lock = NULL;
+        pj_grp_lock_dec_ref_dbg(grp_lock, "ioqueue", 0);
+        pj_grp_lock_release(grp_lock);
+    } else {
+        pj_ioqueue_unlock_key(key);
+    }
 #else
+    if (key->grp_lock) {
+        /* set grp_lock to NULL and unlock */
+        pj_grp_lock_t *grp_lock = key->grp_lock;
+        // Don't set grp_lock to NULL otherwise the other thread
+        // will crash. Just leave it as dangling pointer, but this
+        // should be safe
+        //key->grp_lock = NULL;
+        pj_grp_lock_dec_ref_dbg(grp_lock, "ioqueue", 0);
+        pj_grp_lock_release(grp_lock);
+    } else {
+        pj_ioqueue_unlock_key(key);
+    }
+
     pj_lock_destroy(key->lock);
 #endif
@@ -593 +635 @@
         if (PJ_TIME_VAL_GTE(now, h->free_time)) {
             pj_list_erase(h);
+            // Don't set grp_lock to NULL otherwise the other thread
+            // will crash. Just leave it as dangling pointer, but this
+            // should be safe
+            //h->grp_lock = NULL;
             pj_list_push_back(&ioqueue->free_list, h);
         }
@@ -710 +756 @@
         }
     }
+    for (i=0; i<processed; ++i) {
+        if (queue[i].key->grp_lock)
+            pj_grp_lock_add_ref_dbg(queue[i].key->grp_lock, "ioqueue", 0);
+    }
+
+    PJ_RACE_ME(5);
+
     pj_lock_release(ioqueue->lock);
+
+    PJ_RACE_ME(5);
 
     /* Now process the events. */
@@ -732 +787 @@
         decrement_counter(queue[i].key);
 #endif
+
+        if (queue[i].key->grp_lock)
+            pj_grp_lock_dec_ref_dbg(queue[i].key->grp_lock,
+                                    "ioqueue", 0);
     }