diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2015-03-06 06:09:22 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2015-03-06 06:09:22 +0000 |
| commit | 8249f59293798cb27c1032f7f6a270afa455788d (patch) | |
| tree | b1893b8d60702648d068004b673eb54d2b800538 /pjsip | |
| parent | 17340134a91c4efb1b648a6f87ba5b42a6ce517a (diff) | |
Fixed #1821: Remove unnecessary locking in pjsip transaction and add new API to create a group lock with handler in a single atomic instruction
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4992 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip/sip_transaction.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c index b3fb5e62..c0e57a0f 100644 --- a/pjsip/src/pjsip/sip_transaction.c +++ b/pjsip/src/pjsip/sip_transaction.c @@ -1007,17 +1007,20 @@ static pj_status_t tsx_create( pjsip_module *tsx_user, 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_ref(tsx->grp_lock); - pj_grp_lock_add_handler(tsx->grp_lock, tsx->pool, tsx, &tsx_on_destroy); - status = pj_mutex_create_simple(pool, tsx->obj_name, &tsx->mutex_b); if (status != PJ_SUCCESS) { tsx_shutdown(tsx); @@ -1308,8 +1311,12 @@ PJ_DEF(pj_status_t) pjsip_tsx_create_uac2(pjsip_module *tsx_user, return status; - /* 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. */ tsx->role = PJSIP_ROLE_UAC; @@ -1375,7 +1382,8 @@ PJ_DEF(pj_status_t) pjsip_tsx_create_uac2(pjsip_module *tsx_user, */ 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; } @@ -1387,14 +1395,16 @@ PJ_DEF(pj_status_t) pjsip_tsx_create_uac2(pjsip_module *tsx_user, /* The assertion is removed by #1090: 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; } /* 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(); PJ_LOG(5,(tsx->obj_name, "Transaction created for %s", |