diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-09-06 10:59:18 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-09-06 10:59:18 -0500 |
| commit | e455036e9e66a37dae9bf2905f31dea3625f0bb4 (patch) | |
| tree | e8a919ee443aa59a077b5116fa28a14296d8ff17 /main | |
| parent | dec772d46cfd4cb97f5917cd2263fe10e4074d62 (diff) | |
| parent | e65f170d9c5966d33b32eab57b7e67196126cdc7 (diff) | |
Merge "sorcery: Create function ast_sorcery_lockable_alloc." into 14
Diffstat (limited to 'main')
| -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) { |