kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 14:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

astobj2: Remove legacy ao2_container_alloc routine.

Browse Source 
Replace usage of ao2_container_alloc with ao2_container_alloc_hash or
ao2_container_alloc_list.  Remove ao2_container_alloc macro.

Change-Id: I0907d78bc66efc775672df37c8faad00f2f6c088
This commit is contained in:
Corey Farrell
2018-11-19 15:10:02 -05:00
parent b7af9c8b19
commit 021ce938ca
67 changed files with 315 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_pjsip/config_transport.c
View File

@@ -1575,7 +1575,8 @@ static int populate_transport_states(void *obj, void *arg, int flags)
struct ao2_container *ast_sip_get_transport_states(void)
{
struct ao2_container *states = ao2_container_alloc(DEFAULT_STATE_BUCKETS, transport_state_hash, transport_state_cmp);
struct ao2_container *states = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
DEFAULT_STATE_BUCKETS, transport_state_hash, NULL, transport_state_cmp);
if (!states) {
return NULL;
@@ -1592,7 +1593,8 @@ int ast_sip_initialize_sorcery_transport(void)
struct ao2_container *transports = NULL;
/* Create outbound registration states container. */
transport_states = ao2_container_alloc(DEFAULT_STATE_BUCKETS, internal_state_hash, internal_state_cmp);
transport_states = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
DEFAULT_STATE_BUCKETS, internal_state_hash, NULL, internal_state_cmp);
if (!transport_states) {
ast_log(LOG_ERROR, "Unable to allocate transport states container\n");
return -1;

4
res/res_pjsip/pjsip_transport_management.c
View File

@@ -354,8 +354,8 @@ int ast_sip_initialize_transport_management(void)
{
struct ao2_container *transports;
transports = ao2_container_alloc(TRANSPORTS_BUCKETS, monitored_transport_hash_fn,
monitored_transport_cmp_fn);
transports = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, TRANSPORTS_BUCKETS,
monitored_transport_hash_fn, NULL, monitored_transport_cmp_fn);
if (!transports) {
ast_log(LOG_ERROR, "Could not create container for transports to perform keepalive on.\n");
return AST_MODULE_LOAD_DECLINE;