kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-01 11:02:53 +00:00
Code Issues Projects Releases Wiki Activity

FS-7305 #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2015-03-06 16:44:53 -06:00
parent c35a23af44
commit 5a96512345
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_spandsp/mod_spandsp_fax.c
View File

@ -1641,6 +1641,10 @@ void mod_spandsp_fax_load(switch_memory_pool_t *pool)
switch_mutex_init(&spandsp_globals.cond_mutex, SWITCH_MUTEX_NESTED, spandsp_globals.pool); switch_mutex_init(&spandsp_globals.cond_mutex, SWITCH_MUTEX_NESTED, spandsp_globals.pool);
switch_thread_cond_create(&spandsp_globals.cond, spandsp_globals.pool); switch_thread_cond_create(&spandsp_globals.cond, spandsp_globals.pool);
if (switch_core_test_flag(SCF_MINIMAL)) {
return;
}
launch_timer_thread(); launch_timer_thread();
while(--sanity && !t38_state_list.thread_running) { while(--sanity && !t38_state_list.thread_running) {
@ -1652,6 +1656,10 @@ void mod_spandsp_fax_shutdown(void)
{ {
switch_status_t tstatus = SWITCH_STATUS_SUCCESS; switch_status_t tstatus = SWITCH_STATUS_SUCCESS;
if (switch_core_test_flag(SCF_MINIMAL)) {
return;
}
t38_state_list.thread_running = 0; t38_state_list.thread_running = 0;
wake_thread(1); wake_thread(1);
switch_thread_join(&tstatus, t38_state_list.thread); switch_thread_join(&tstatus, t38_state_list.thread);

12
src/switch_event.c
View File

@ -529,6 +529,10 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void)
const void *var; const void *var;
void *val; void *val;
if (switch_core_test_flag(SCF_MINIMAL)) {
return SWITCH_STATUS_SUCCESS;
}
switch_mutex_lock(EVENT_QUEUE_MUTEX); switch_mutex_lock(EVENT_QUEUE_MUTEX);
SYSTEM_RUNNING = 0; SYSTEM_RUNNING = 0;
switch_mutex_unlock(EVENT_QUEUE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_MUTEX);
@ -659,6 +663,7 @@ SWITCH_DECLARE(void) switch_event_launch_dispatch_threads(uint32_t max)
SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool) SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool)
{ {
/* don't need any more dispatch threads than we have CPU's*/ /* don't need any more dispatch threads than we have CPU's*/
MAX_DISPATCH = (switch_core_cpu_count() / 2) + 1; MAX_DISPATCH = (switch_core_cpu_count() / 2) + 1;
if (MAX_DISPATCH < 2) { if (MAX_DISPATCH < 2) {
@ -667,13 +672,18 @@ SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool)
switch_assert(pool != NULL); switch_assert(pool != NULL);
THRUNTIME_POOL = RUNTIME_POOL = pool; THRUNTIME_POOL = RUNTIME_POOL = pool;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Eventing Engine.\n");
switch_thread_rwlock_create(&RWLOCK, RUNTIME_POOL); switch_thread_rwlock_create(&RWLOCK, RUNTIME_POOL);
switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
switch_mutex_init(&POOL_LOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_mutex_init(&POOL_LOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
switch_mutex_init(&EVENT_QUEUE_MUTEX, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_mutex_init(&EVENT_QUEUE_MUTEX, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
switch_core_hash_init(&CUSTOM_HASH); switch_core_hash_init(&CUSTOM_HASH);
if (switch_core_test_flag(SCF_MINIMAL)) {
return SWITCH_STATUS_SUCCESS;
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Eventing Engine.\n");
switch_core_hash_init(&event_channel_manager.lahash); switch_core_hash_init(&event_channel_manager.lahash);
switch_mutex_init(&event_channel_manager.lamutex, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_mutex_init(&event_channel_manager.lamutex, SWITCH_MUTEX_NESTED, RUNTIME_POOL);