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

Merge pull request #985 in FS/freeswitch from ~DINGDING/freeswitch:bugfix/FS-9583-fix-mod-fifo-node_thread_run-bug to master 

* commit 'a4080cc4beb26b60f7e4c9f8faf9cfd3a052017e':
  FS-9583 [mod_fifo] fix node_thread_run blocking outbound_ringall_thread_run and outbound_enterprise_thread_run
This commit is contained in:
Mike Jerris 2016-10-07 10:42:40 -05:00
parent 195554814c a4080cc4be
commit babe1042cc
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2013,9 +2013,10 @@ static int place_call_enterprise_callback(void *pArg, int argc, char **argv, cha
* effect. outbound_per_cycle and outbound_per_cycle_min both default to 1.
*
*/
static void find_consumers(fifo_node_t *node)
static int find_consumers(fifo_node_t *node)
{
char *sql;
int ret = 0;
sql = switch_mprintf("select uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, "
"next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname "
@ -2029,6 +2030,7 @@ static void find_consumers(fifo_node_t *node)
case NODE_STRATEGY_ENTERPRISE:
{
int need = node_caller_count(node);
int count;
if (node->outbound_per_cycle && node->outbound_per_cycle < need) {
need = node->outbound_per_cycle;
@ -2036,7 +2038,9 @@ static void find_consumers(fifo_node_t *node)
need = node->outbound_per_cycle_min;
}
count = need;
fifo_execute_sql_callback(globals.sql_mutex, sql, place_call_enterprise_callback, &need);
ret = count - need;
}
break;
case NODE_STRATEGY_RINGALL:
@ -2058,6 +2062,7 @@ static void find_consumers(fifo_node_t *node)
fifo_execute_sql_callback(globals.sql_mutex, sql, place_call_ringall_callback, cbh);
if (cbh->rowcount) {
ret = cbh->rowcount;
switch_threadattr_create(&thd_attr, cbh->pool);
switch_threadattr_detach_set(thd_attr, 1);
switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
@ -2072,6 +2077,7 @@ static void find_consumers(fifo_node_t *node)
}
switch_safe_free(sql);
return ret;
}
/*\brief Continuously attempt to deliver calls to outbound members
@ -2096,7 +2102,7 @@ static void *SWITCH_THREAD_FUNC node_thread_run(switch_thread_t *thread, void *o
globals.node_thread_running = 1;
while (globals.node_thread_running == 1) {
int ppl_waiting, consumer_total, idle_consumers, found = 0;
int ppl_waiting, consumer_total, idle_consumers, need_sleep = 0;
switch_mutex_lock(globals.mutex);
@ -2161,9 +2167,9 @@ static void *SWITCH_THREAD_FUNC node_thread_run(switch_thread_t *thread, void *o
}
if ((ppl_waiting - this_node->ring_consumer_count > 0) && (!consumer_total || !idle_consumers)) {
found++;
find_consumers(this_node);
switch_yield(1000000);
if (find_consumers(this_node)) {
need_sleep++;
}
}
}
}
@ -2174,8 +2180,9 @@ static void *SWITCH_THREAD_FUNC node_thread_run(switch_thread_t *thread, void *o
switch_mutex_unlock(globals.mutex);
if (cur_priority == 1) {
if (cur_priority == 1 || need_sleep) {
switch_yield(1000000);
need_sleep = 0;
}
}