kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

fix expires seg in event_sink

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15594 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-11-21 06:17:05 +00:00
parent 421a06ce6a
commit 3303abca65
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
View File

@ -193,29 +193,33 @@ static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch
static switch_status_t expire_listener(listener_t **listener) static switch_status_t expire_listener(listener_t **listener)
{ {
listener_t *l;
if (!(*listener)->expire_time) { if (!listener || !*listener) return SWITCH_STATUS_FALSE;
(*listener)->expire_time = switch_epoch_time_now(NULL); l = *listener;
if (!l->expire_time) {
l->expire_time = switch_epoch_time_now(NULL);
}
if (switch_thread_rwlock_trywrlock(l->rwlock) != SWITCH_STATUS_SUCCESS) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (switch_thread_rwlock_trywrlock((*listener)->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(l->session), SWITCH_LOG_CRIT, "Stateful Listener %u has expired\n", l->id);
return SWITCH_STATUS_FALSE;
}
if (globals.debug > 0) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG((*listener)->session), SWITCH_LOG_DEBUG, "Stateful Listener %u has expired\n", (*listener)->id);
}
flush_listener(*listener, SWITCH_TRUE, SWITCH_TRUE); flush_listener(*listener, SWITCH_TRUE, SWITCH_TRUE);
switch_core_hash_destroy(&(*listener)->event_hash); switch_core_hash_destroy(&l->event_hash);
switch_core_destroy_memory_pool(&(*listener)->pool);
switch_mutex_lock((*listener)->filter_mutex); switch_mutex_lock(l->filter_mutex);
if ((*listener)->filters) { if (l->filters) {
switch_event_destroy(&(*listener)->filters); switch_event_destroy(&l->filters);
} }
switch_mutex_unlock((*listener)->filter_mutex);
switch_thread_rwlock_unlock((*listener)->rwlock); switch_mutex_unlock(l->filter_mutex);
switch_thread_rwlock_unlock(l->rwlock);
switch_core_destroy_memory_pool(&l->pool);
*listener = NULL; *listener = NULL;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -224,6 +228,7 @@ static void event_handler(switch_event_t *event)
{ {
switch_event_t *clone = NULL; switch_event_t *clone = NULL;
listener_t *l, *lp, *last = NULL; listener_t *l, *lp, *last = NULL;
time_t now = switch_epoch_time_now(NULL);
switch_assert(event != NULL); switch_assert(event != NULL);
@ -236,29 +241,26 @@ static void event_handler(switch_event_t *event)
switch_mutex_lock(globals.listener_mutex); switch_mutex_lock(globals.listener_mutex);
while(lp) { while(lp) {
int send = 0; int send = 0;
time_t now = switch_epoch_time_now(NULL);
l = lp; l = lp;
lp = lp->next; lp = lp->next;
if (!switch_test_flag(l, LFLAG_EVENTS)) { if (switch_test_flag(l, LFLAG_STATEFUL) && (l->expire_time || (l->timeout && now - l->last_flush > l->timeout))) {
last = lp;
continue;
}
if (switch_test_flag(l, LFLAG_STATEFUL) && l->timeout && now - l->last_flush > l->timeout) {
if (expire_listener(&l) == SWITCH_STATUS_SUCCESS) { if (expire_listener(&l) == SWITCH_STATUS_SUCCESS) {
if (last) { if (last) {
last->next = lp; last->next = lp;
} else { } else {
listen_list.listeners = lp; listen_list.listeners = lp;
} }
continue; continue;
} }
} }
if (l->expire_time || !switch_test_flag(l, LFLAG_EVENTS)) {
last = l;
continue;
}
if (l->event_list[SWITCH_EVENT_ALL]) { if (l->event_list[SWITCH_EVENT_ALL]) {
send = 1; send = 1;
} else if ((l->event_list[event->event_id])) { } else if ((l->event_list[event->event_id])) {
@ -347,7 +349,7 @@ static void event_handler(switch_event_t *event)
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(l->session), SWITCH_LOG_ERROR, "Memory Error!\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(l->session), SWITCH_LOG_ERROR, "Memory Error!\n");
} }
} }
last = lp; last = l;
} }
switch_mutex_unlock(globals.listener_mutex); switch_mutex_unlock(globals.listener_mutex);
} }