Changeset 4992 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Mar 6, 2015 6:09:22 AM (9 years ago)

Author:

ming

Message:

Fixed #1821: Remove unnecessary locking in pjsip transaction and add new API to create a group lock with handler in a single atomic instruction

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -1008 +1008 @@
     if (grp_lock) {
         tsx->grp_lock = grp_lock;
+        
+        pj_grp_lock_add_ref(tsx->grp_lock);
+        pj_grp_lock_add_handler(tsx->grp_lock, tsx->pool, tsx, &tsx_on_destroy);
     } else {
-        status = pj_grp_lock_create(pool, NULL, &tsx->grp_lock);
+        status = pj_grp_lock_create_w_handler(pool, NULL, tsx, &tsx_on_destroy,
+                                              &tsx->grp_lock);
         if (status != PJ_SUCCESS) {
             pjsip_endpt_release_pool(mod_tsx_layer.endpt, pool);
             return status;
         }
-    }
-
-    pj_grp_lock_add_ref(tsx->grp_lock);
-    pj_grp_lock_add_handler(tsx->grp_lock, tsx->pool, tsx, &tsx_on_destroy);
+        
+        pj_grp_lock_add_ref(tsx->grp_lock);
+    }
 
     status = pj_mutex_create_simple(pool, tsx->obj_name, &tsx->mutex_b);
@@ -1309 +1312 @@
 
 
-    /* Lock transaction. */
-    pj_grp_lock_acquire(tsx->grp_lock);
+    /* Lock transaction.
+     * We don't need to lock the group lock if none was supplied, while the
+     * newly created group lock has not been exposed.
+     */
+    if (grp_lock)
+        pj_grp_lock_acquire(tsx->grp_lock);
 
     /* Role is UAC. */
@@ -1376 +1383 @@
     status = pjsip_get_request_dest(tdata, &dst_info);
     if (status != PJ_SUCCESS) {
-        pj_grp_lock_release(tsx->grp_lock);
+        if (grp_lock)
+            pj_grp_lock_release(tsx->grp_lock);
         tsx_shutdown(tsx);
         return status;
@@ -1388 +1396 @@
         pj_assert(!"Bug in branch_param generator (i.e. not unique)");
         */
-        pj_grp_lock_release(tsx->grp_lock);
+        if (grp_lock)
+            pj_grp_lock_release(tsx->grp_lock);
         tsx_shutdown(tsx);
         return status;
@@ -1395 +1404 @@
 
     /* Unlock transaction and return. */
-    pj_grp_lock_release(tsx->grp_lock);
+    if (grp_lock)
+        pj_grp_lock_release(tsx->grp_lock);
 
     pj_log_push_indent();