diff options
| author | Corey Farrell <git@cfware.com> | 2016-08-26 18:22:51 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-09-02 09:26:25 -0400 |
| commit | e875e1c12a4b954b18e136b25c2a83b5f8e15f5d (patch) | |
| tree | 0b41985ce22c2689ac8a394f71f8ece3422f5c10 /main/sorcery.c | |
| parent | 131baf70d6f349f7adee81419410f78790c0ebda (diff) | |
sorcery: Create function ast_sorcery_lockable_alloc.
Create an alternative to ast_sorcery_generic_alloc which uses astobj2
shared locking. Use this new method for the 'struct ast_sip_aor' allocator.
Change-Id: I3f62f2ada64b622571950278fbb6ad57395b5d6f
Diffstat (limited to 'main/sorcery.c')
| -rw-r--r-- | main/sorcery.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/main/sorcery.c b/main/sorcery.c index 55ee830b7..9f8c35c3b 100644 --- a/main/sorcery.c +++ b/main/sorcery.c @@ -1736,9 +1736,26 @@ static void sorcery_object_destructor(void *object) ast_free(details->object->id); } +void *ast_sorcery_lockable_alloc(size_t size, ao2_destructor_fn destructor, void *lockobj) +{ + void *object = ao2_alloc_with_lockobj(size + sizeof(struct ast_sorcery_object), + sorcery_object_destructor, lockobj, ""); + struct ast_sorcery_object_details *details = object; + + if (!object) { + return NULL; + } + + details->object = object + size; + details->object->destructor = destructor; + + return object; +} + void *ast_sorcery_generic_alloc(size_t size, ao2_destructor_fn destructor) { - void *object = ao2_alloc_options(size + sizeof(struct ast_sorcery_object), sorcery_object_destructor, AO2_ALLOC_OPT_LOCK_NOLOCK); + void *object = ao2_alloc_options(size + sizeof(struct ast_sorcery_object), + sorcery_object_destructor, AO2_ALLOC_OPT_LOCK_NOLOCK); struct ast_sorcery_object_details *details = object; if (!object) { |