kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-05 12:41:38 +00:00
Code Issues Projects Releases Wiki Activity

add ref counter to la

Browse Source
This commit is contained in:
Anthony Minessale 2013-11-01 02:21:04 +05:00
parent c8b80cced6
commit 4a8e9d634d
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/switch_event.c
View File

@ -3055,6 +3055,7 @@ struct switch_live_array_s {
switch_live_array_command_handler_t command_handler; switch_live_array_command_handler_t command_handler;
void *user_data; void *user_data;
alias_node_t *aliases; alias_node_t *aliases;
int refs;
}; };
static switch_status_t la_broadcast(switch_live_array_t *la, cJSON **json) static switch_status_t la_broadcast(switch_live_array_t *la, cJSON **json)
@ -3215,9 +3216,21 @@ SWITCH_DECLARE(switch_status_t) switch_live_array_destroy(switch_live_array_t **
switch_live_array_t *la = *live_arrayP; switch_live_array_t *la = *live_arrayP;
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
alias_node_t *np; alias_node_t *np;
int done = 0;
*live_arrayP = NULL; *live_arrayP = NULL;
switch_mutex_lock(la->mutex);
if (la->refs) {
la->refs--;
}
if (la->refs) done = 1;
switch_mutex_unlock(la->mutex);
if (done) {
return SWITCH_STATUS_SUCCESS;
}
pool = la->pool; pool = la->pool;
switch_live_array_clear(la); switch_live_array_clear(la);
@ -3311,7 +3324,6 @@ SWITCH_DECLARE(switch_bool_t) switch_live_array_add_alias(switch_live_array_t *l
return !exist; return !exist;
} }
SWITCH_DECLARE(switch_status_t) switch_live_array_create(const char *event_channel, const char *name, SWITCH_DECLARE(switch_status_t) switch_live_array_create(const char *event_channel, const char *name,
switch_event_channel_id_t channel_id, switch_live_array_t **live_arrayP) switch_event_channel_id_t channel_id, switch_live_array_t **live_arrayP)
{ {
@ -3346,6 +3358,10 @@ SWITCH_DECLARE(switch_status_t) switch_live_array_create(const char *event_chann
switch_mutex_unlock(event_channel_manager.lamutex); switch_mutex_unlock(event_channel_manager.lamutex);
} }
switch_mutex_lock(la->mutex);
la->refs++;
switch_mutex_unlock(la->mutex);
*live_arrayP = la; *live_arrayP = la;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
@ -3559,14 +3575,16 @@ SWITCH_DECLARE(void) switch_live_array_parse_json(cJSON *json, switch_event_chan
const char *sessid = cJSON_GetObjectCstr(json, "sessid"); const char *sessid = cJSON_GetObjectCstr(json, "sessid");
if (command) { if (command) {
switch_live_array_create(context, name, channel_id, &la); if (switch_live_array_create(context, name, channel_id, &la) == SWITCH_STATUS_SUCCESS) {
if (!strcasecmp(command, "bootstrap")) { if (!strcasecmp(command, "bootstrap")) {
switch_live_array_bootstrap(la, sessid, channel_id); switch_live_array_bootstrap(la, sessid, channel_id);
} else { } else {
if (la->command_handler) { if (la->command_handler) {
la->command_handler(la, command, sessid, jla, la->user_data); la->command_handler(la, command, sessid, jla, la->user_data);
}
} }
switch_live_array_destroy(&la);
} }
} }
} }