kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

astobj2: Eliminate usage of legacy ao2_container_alloc routine.

Browse Source 
Replace usage of ao2_container_alloc with ao2_container_alloc_hash or
ao2_container_alloc_list.

ao2_container_alloc is now restricted to modules only and is being
removed from Asterisk 17.

Change-Id: I0907d78bc66efc775672df37c8faad00f2f6c088
This commit is contained in:
Corey Farrell
2018-11-19 11:20:21 -05:00
parent 78dbbcef65
commit 0a9904e1c6
65 changed files with 330 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/stasis_channels.c
View File

@@ -613,8 +613,8 @@ struct ast_multi_channel_blob *ast_multi_channel_blob_create(struct ast_json *bl
return NULL;
}
obj->channel_snapshots = ao2_container_alloc(NUM_MULTI_CHANNEL_BLOB_BUCKETS,
channel_role_hash_cb, channel_role_cmp_cb);
obj->channel_snapshots = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NUM_MULTI_CHANNEL_BLOB_BUCKETS, channel_role_hash_cb, NULL, channel_role_cmp_cb);
if (!obj->channel_snapshots) {
ao2_ref(obj, -1);
return NULL;
@@ -717,8 +717,9 @@ struct ao2_container *ast_multi_channel_blob_get_channels(struct ast_multi_chann
return NULL;
}
ret_container = ao2_container_alloc(NUM_MULTI_CHANNEL_BLOB_BUCKETS,
channel_snapshot_hash_cb, channel_snapshot_cmp_cb);
ret_container = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NUM_MULTI_CHANNEL_BLOB_BUCKETS,
channel_snapshot_hash_cb, NULL, channel_snapshot_cmp_cb);
if (!ret_container) {
return NULL;
}