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

FS-9602 [mod_fifo] fix outbound_ringall_thread_run ring_consumer_count

This commit is contained in:
dingding 2016-10-06 09:43:09 +08:00
parent c6ece47314
commit 6cf77759a8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1471,7 +1471,7 @@ static void *SWITCH_THREAD_FUNC outbound_ringall_thread_run(switch_thread_t *thr
switch_mutex_lock(node->update_mutex); switch_mutex_lock(node->update_mutex);
node->busy = 0; node->busy = 0;
node->ring_consumer_count = 1; node->ring_consumer_count++;
switch_mutex_unlock(node->update_mutex); switch_mutex_unlock(node->update_mutex);
SWITCH_STANDARD_STREAM(stream); SWITCH_STANDARD_STREAM(stream);
@ -1734,7 +1734,9 @@ static void *SWITCH_THREAD_FUNC outbound_ringall_thread_run(switch_thread_t *thr
if (node) { if (node) {
switch_mutex_lock(node->update_mutex); switch_mutex_lock(node->update_mutex);
node->ring_consumer_count = 0; if (--node->ring_consumer_count < 0) {
node->ring_consumer_count = 0;
}
node->busy = 0; node->busy = 0;
switch_mutex_unlock(node->update_mutex); switch_mutex_unlock(node->update_mutex);
switch_thread_rwlock_unlock(node->rwlock); switch_thread_rwlock_unlock(node->rwlock);
@ -1911,7 +1913,7 @@ static void *SWITCH_THREAD_FUNC outbound_enterprise_thread_run(switch_thread_t *
switch_event_destroy(&ovars); switch_event_destroy(&ovars);
if (node) { if (node) {
switch_mutex_lock(node->update_mutex); switch_mutex_lock(node->update_mutex);
if (node->ring_consumer_count-- < 0) { if (--node->ring_consumer_count < 0) {
node->ring_consumer_count = 0; node->ring_consumer_count = 0;
} }
node->busy = 0; node->busy = 0;