From 8249f59293798cb27c1032f7f6a270afa455788d Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Fri, 6 Mar 2015 06:09:22 +0000 Subject: 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 --- pjlib/include/pj/lock.h | 21 +++++++++++++++++++ pjlib/src/pj/lock.c | 56 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 63 insertions(+), 14 deletions(-) (limited to 'pjlib') diff --git a/pjlib/include/pj/lock.h b/pjlib/include/pj/lock.h index b1a5d72e..415ea951 100644 --- a/pjlib/include/pj/lock.h +++ b/pjlib/include/pj/lock.h @@ -217,6 +217,27 @@ PJ_DECL(pj_status_t) pj_grp_lock_create(pj_pool_t *pool, const pj_grp_lock_config *cfg, pj_grp_lock_t **p_grp_lock); +/** + * Create a group lock object, with the specified destructor handler, to be + * called by the group lock when it is about to be destroyed. Initially the + * group lock will have reference counter of one. + * + * @param pool The group lock only uses the pool parameter to get + * the pool factory, from which it will create its own + * pool. + * @param cfg Optional configuration. + * @param member A pointer to be passed to the handler. + * @param handler The destroy handler. + * @param p_grp_lock Pointer to receive the newly created group lock. + * + * @return PJ_SUCCESS or the appropriate error code. + */ +PJ_DECL(pj_status_t) pj_grp_lock_create_w_handler(pj_pool_t *pool, + const pj_grp_lock_config *cfg, + void *member, + void (*handler)(void *member), + pj_grp_lock_t **p_grp_lock); + /** * Forcibly destroy the group lock, ignoring the reference counter value. * diff --git a/pjlib/src/pj/lock.c b/pjlib/src/pj/lock.c index d7f4ffaf..15278271 100644 --- a/pjlib/src/pj/lock.c +++ b/pjlib/src/pj/lock.c @@ -335,6 +335,31 @@ static pj_status_t grp_lock_release(LOCK_OBJ *p) return pj_grp_lock_dec_ref(glock); } +static pj_status_t grp_lock_add_handler( pj_grp_lock_t *glock, + pj_pool_t *pool, + void *comp, + void (*destroy)(void *comp), + pj_bool_t acquire_lock) +{ + grp_destroy_callback *cb; + + if (acquire_lock) + grp_lock_acquire(glock); + + if (pool == NULL) + pool = glock->pool; + + cb = PJ_POOL_ZALLOC_T(pool, grp_destroy_callback); + cb->comp = comp; + cb->handler = destroy; + pj_list_push_back(&glock->destroy_list, cb); + + if (acquire_lock) + grp_lock_release(glock); + + return PJ_SUCCESS; +} + static pj_status_t grp_lock_destroy(LOCK_OBJ *p) { pj_grp_lock_t *glock = (pj_grp_lock_t*)p; @@ -427,6 +452,22 @@ on_error: return status; } +PJ_DEF(pj_status_t) pj_grp_lock_create_w_handler( pj_pool_t *pool, + const pj_grp_lock_config *cfg, + void *member, + void (*handler)(void *member), + pj_grp_lock_t **p_grp_lock) +{ + pj_status_t status; + + status = pj_grp_lock_create(pool, cfg, p_grp_lock); + if (status == PJ_SUCCESS) { + grp_lock_add_handler(*p_grp_lock, pool, member, handler, PJ_FALSE); + } + + return status; +} + PJ_DEF(pj_status_t) pj_grp_lock_destroy( pj_grp_lock_t *grp_lock) { return grp_lock_destroy(grp_lock); @@ -476,20 +517,7 @@ PJ_DEF(pj_status_t) pj_grp_lock_add_handler( pj_grp_lock_t *glock, void *comp, void (*destroy)(void *comp)) { - grp_destroy_callback *cb; - - grp_lock_acquire(glock); - - if (pool == NULL) - pool = glock->pool; - - cb = PJ_POOL_ZALLOC_T(pool, grp_destroy_callback); - cb->comp = comp; - cb->handler = destroy; - pj_list_push_back(&glock->destroy_list, cb); - - grp_lock_release(glock); - return PJ_SUCCESS; + return grp_lock_add_handler(glock, pool, comp, destroy, PJ_TRUE); } PJ_DEF(pj_status_t) pj_grp_lock_del_handler( pj_grp_lock_t *glock, -- cgit v1.2.3