kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-5488 --resolve

This commit is contained in:
Anthony Minessale 2013-05-31 14:45:47 -05:00
parent fc39b77520
commit bcd770e017
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -1854,8 +1854,6 @@ static void *SWITCH_THREAD_FUNC node_thread_run(switch_thread_t *thread, void *o
node = node->next; node = node->next;
if (this_node->ready == 0) { if (this_node->ready == 0) {
switch_core_hash_delete(globals.fifo_hash, this_node->name);
for (x = 0; x < MAX_PRI; x++) { for (x = 0; x < MAX_PRI; x++) {
while (fifo_queue_pop(this_node->fifo_list[x], &pop, 2) == SWITCH_STATUS_SUCCESS) { while (fifo_queue_pop(this_node->fifo_list[x], &pop, 2) == SWITCH_STATUS_SUCCESS) {
const char *caller_uuid = switch_event_get_header(pop, "unique-id"); const char *caller_uuid = switch_event_get_header(pop, "unique-id");
@ -3293,7 +3291,9 @@ SWITCH_STANDARD_APP(fifo_function)
continue; continue;
} }
switch_thread_rwlock_unlock(node->rwlock); switch_thread_rwlock_unlock(node->rwlock);
if (node->ready == 1 && do_destroy) {
if (node->ready == 1 && do_destroy && node_caller_count(node) == 0 && node->consumer_count == 0) {
switch_core_hash_delete(globals.fifo_hash, node->name);
node->ready = 0; node->ready = 0;
} }
} }