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

added some cleanup code

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10409 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Andrew Thompson 2008-11-14 22:35:40 +00:00
parent 137a0759f8
commit bca7917503
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
View File

@ -230,7 +230,7 @@ static void expire_listener(listener_t **listener)
} }
static void remove_binding(listener_t *listener) { static void remove_binding(listener_t *listener, erlang_pid *pid) {
struct erlang_binding *ptr, *lst = NULL; struct erlang_binding *ptr, *lst = NULL;
switch_mutex_lock(globals.listener_mutex); switch_mutex_lock(globals.listener_mutex);
@ -238,11 +238,13 @@ static void remove_binding(listener_t *listener) {
switch_xml_set_binding_sections(bindings.search_binding, (1 << sizeof(switch_xml_section_enum_t))); switch_xml_set_binding_sections(bindings.search_binding, (1 << sizeof(switch_xml_section_enum_t)));
for (ptr = bindings.head; ptr; lst = ptr, ptr = ptr->next) { for (ptr = bindings.head; ptr; lst = ptr, ptr = ptr->next) {
if (ptr->listener == listener) { if ((listener && ptr->listener == listener) ||
(pid && (&ptr->pid) && (!strcmp(pid->node, ptr->pid.node)) && pid->creation == ptr->pid.creation && pid->num == ptr->pid.num && pid->serial == ptr->pid.serial)) {
if (bindings.head == ptr) { if (bindings.head == ptr) {
if (ptr->next) { if (ptr->next) {
bindings.head = ptr->next; bindings.head = ptr->next;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removed all (only?) listeners\n");
bindings.head = NULL; bindings.head = NULL;
break; break;
} }
@ -253,6 +255,7 @@ static void remove_binding(listener_t *listener) {
lst->next = NULL; lst->next = NULL;
} }
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removed listener\n");
} else { } else {
switch_xml_set_binding_sections(bindings.search_binding, switch_xml_get_binding_sections(bindings.search_binding) | ptr->section); switch_xml_set_binding_sections(bindings.search_binding, switch_xml_get_binding_sections(bindings.search_binding) | ptr->section);
} }
@ -611,6 +614,11 @@ static switch_xml_t erlang_fetch(const char *sectionstr, const char *tag_name, c
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got data %s after %d milliseconds!\n", data, i*10); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got data %s after %d milliseconds!\n", data, i*10);
switch_core_hash_delete(ptr->listener->fetch_reply_hash, uuid_str);
free(rep->buff);
free(rep);
return xml; return xml;
} }
@ -1214,6 +1222,7 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
break; break;
case ERL_EXIT : case ERL_EXIT :
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_exit from %s <%d.%d.%d>\n", msg.from.node, msg.from.creation, msg.from.num, msg.from.serial); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_exit from %s <%d.%d.%d>\n", msg.from.node, msg.from.creation, msg.from.num, msg.from.serial);
remove_binding(NULL, &msg.from);
/* TODO - check if this linked pid is any of the log/event handler processes and cleanup if it is. */ /* TODO - check if this linked pid is any of the log/event handler processes and cleanup if it is. */
break; break;
default : default :
@ -1293,7 +1302,7 @@ done:
switch_core_hash_destroy(&listener->event_hash); switch_core_hash_destroy(&listener->event_hash);
/* remove any bindings for this connection */ /* remove any bindings for this connection */
remove_binding(listener); remove_binding(listener, NULL);
if (listener->session) { if (listener->session) {
switch_channel_clear_flag(switch_core_session_get_channel(listener->session), CF_CONTROLLED); switch_channel_clear_flag(switch_core_session_get_channel(listener->session), CF_CONTROLLED);