kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +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 15:10:15 -05:00
parent 0e096aefac
commit ed7a5664b6
67 changed files with 321 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_sip.c
View File

@@ -1815,8 +1815,9 @@ static int initialize_escs(void)
{
int i, res = 0;
for (i = 0; i < ARRAY_LEN(event_state_compositors); i++) {
if (!((event_state_compositors[i].compositor) =
ao2_container_alloc(ESC_MAX_BUCKETS, esc_hash_fn, esc_cmp_fn))) {
event_state_compositors[i].compositor = ao2_container_alloc_hash(
AO2_ALLOC_OPT_LOCK_MUTEX, 0, ESC_MAX_BUCKETS, esc_hash_fn, NULL, esc_cmp_fn);
if (!event_state_compositors[i].compositor) {
res = -1;
}
}
@@ -35517,7 +35518,9 @@ static int load_module(void)
unload_module();
return AST_MODULE_LOAD_DECLINE;
}
if (!(sip_monitor_instances = ao2_container_alloc(37, sip_monitor_instance_hash_fn, sip_monitor_instance_cmp_fn))) {
sip_monitor_instances = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, 37,
sip_monitor_instance_hash_fn, NULL, sip_monitor_instance_cmp_fn);
if (!sip_monitor_instances) {
unload_module();
return AST_MODULE_LOAD_DECLINE;
}