Changeset 5194 for pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

Timestamp:

Nov 6, 2015 4:18:46 AM (9 years ago)

Author:

nanang

Message:

Close #1894: Improve ioqueue performance on multithreadeded environment.

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (6 diffs)

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

@@ -196 +196 @@
  * framework.
  */
-void ioqueue_dispatch_write_event(pj_ioqueue_t *ioqueue, pj_ioqueue_key_t *h)
-{
-    /* Lock the key. */
-    pj_ioqueue_lock_key(h);
+pj_bool_t ioqueue_dispatch_write_event( pj_ioqueue_t *ioqueue,
+                                        pj_ioqueue_key_t *h)
+{
+    pj_status_t rc;
+
+    /* Try lock the key. */
+    rc = pj_ioqueue_trylock_key(h);
+    if (rc != PJ_SUCCESS) {
+        return PJ_FALSE;
+    }
 
     if (IS_CLOSING(h)) {
         pj_ioqueue_unlock_key(h);
-        return;
+        return PJ_TRUE;
     }
 
@@ -418 +424 @@
          */
         pj_ioqueue_unlock_key(h);
-    }
-}
-
-void ioqueue_dispatch_read_event( pj_ioqueue_t *ioqueue, pj_ioqueue_key_t *h )
+
+        return PJ_FALSE;
+    }
+
+    return PJ_TRUE;
+}
+
+pj_bool_t ioqueue_dispatch_read_event( pj_ioqueue_t *ioqueue,
+                                       pj_ioqueue_key_t *h )
 {
     pj_status_t rc;
 
-    /* Lock the key. */
-    pj_ioqueue_lock_key(h);
+    /* Try lock the key. */
+    rc = pj_ioqueue_trylock_key(h);
+    if (rc != PJ_SUCCESS) {
+        return PJ_FALSE;
+    }
 
     if (IS_CLOSING(h)) {
         pj_ioqueue_unlock_key(h);
-        return;
+        return PJ_TRUE;
     }
 
@@ -605 +619 @@
          */
         pj_ioqueue_unlock_key(h);
-    }
-}
-
-
-void ioqueue_dispatch_exception_event( pj_ioqueue_t *ioqueue, 
-                                       pj_ioqueue_key_t *h )
+
+        return PJ_FALSE;
+    }
+
+    return PJ_TRUE;
+}
+
+
+pj_bool_t ioqueue_dispatch_exception_event( pj_ioqueue_t *ioqueue,
+                                            pj_ioqueue_key_t *h )
 {
     pj_bool_t has_lock;
-
-    pj_ioqueue_lock_key(h);
+    pj_status_t rc;
+
+    /* Try lock the key. */
+    rc = pj_ioqueue_trylock_key(h);
+    if (rc != PJ_SUCCESS) {
+        return PJ_FALSE;
+    }
 
     if (!h->connecting) {
@@ -622 +645 @@
          */
         pj_ioqueue_unlock_key(h);
-        return;
+        return PJ_TRUE;
     }
 
     if (IS_CLOSING(h)) {
         pj_ioqueue_unlock_key(h);
-        return;
+        return PJ_TRUE;
     }
 
@@ -669 +692 @@
         pj_ioqueue_unlock_key(h);
     }
+
+    return PJ_TRUE;
 }
 
@@ -1325 +1350 @@
 }
 
+PJ_DEF(pj_status_t) pj_ioqueue_trylock_key(pj_ioqueue_key_t *key)
+{
+    if (key->grp_lock)
+        return pj_grp_lock_tryacquire(key->grp_lock);
+    else
+        return pj_lock_tryacquire(key->lock);
+}
+
 PJ_DEF(pj_status_t) pj_ioqueue_unlock_key(pj_ioqueue_key_t *key)
 {