kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +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

22
main/data.c
View File

@@ -323,8 +323,9 @@ static struct data_provider *data_provider_new(const char *name,
strcpy(node->name, name);
/* initialize the childrens container. */
if (!(node->children = ao2_container_alloc(NUM_DATA_NODE_BUCKETS,
data_provider_hash, data_provider_cmp))) {
node->children = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NUM_DATA_NODE_BUCKETS, data_provider_hash, NULL, data_provider_cmp);
if (!node->children) {
ao2_ref(node, -1);
return NULL;
}
@@ -698,8 +699,8 @@ static struct ast_data_search *data_search_alloc(const char *name)
return NULL;
}
res->children = ao2_container_alloc(NUM_DATA_SEARCH_BUCKETS, data_search_hash,
data_search_cmp);
res->children = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NUM_DATA_SEARCH_BUCKETS, data_search_hash, NULL, data_search_cmp);
if (!res->children) {
ao2_ref(res, -1);
@@ -1418,8 +1419,8 @@ static struct ast_data *data_result_create(const char *name)
strcpy(res->name, namelen ? name : "");
/* initialize the children container */
res->children = ao2_container_alloc(NUM_DATA_RESULT_BUCKETS, data_result_hash,
data_result_cmp);
res->children = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NUM_DATA_RESULT_BUCKETS, data_result_hash, NULL, data_result_cmp);
if (!res->children) {
ao2_ref(res, -1);
return NULL;
@@ -1656,8 +1657,8 @@ static struct data_filter *data_filter_alloc(const char *name)
return NULL;
}
res->children = ao2_container_alloc(NUM_DATA_FILTER_BUCKETS, data_filter_hash,
data_filter_cmp);
res->children = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NUM_DATA_FILTER_BUCKETS, data_filter_hash, NULL, data_filter_cmp);
if (!res->children) {
ao2_ref(res, -1);
@@ -3335,8 +3336,9 @@ int ast_data_init(void)
ast_rwlock_init(&root_data.lock);
if (!(root_data.container = ao2_container_alloc(NUM_DATA_NODE_BUCKETS,
data_provider_hash, data_provider_cmp))) {
root_data.container = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
NUM_DATA_NODE_BUCKETS, data_provider_hash, NULL, data_provider_cmp);
if (!root_data.container) {
return -1;
}