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

fix possible endless loop race during shutdown 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4410 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-02-28 15:14:39 +00:00
parent ea8544579d
commit 5465291b53
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mod/timers/mod_softtimer/mod_softtimer.c
View File

@ -62,6 +62,10 @@ static inline switch_status_t timer_init(switch_timer_t *timer)
{ {
timer_private_t *private_info; timer_private_t *private_info;
if (globals.RUNNING != 1) {
return SWITCH_STATUS_FALSE;
}
if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) { if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) {
switch_mutex_lock(globals.mutex); switch_mutex_lock(globals.mutex);
TIMER_MATRIX[timer->interval].count++; TIMER_MATRIX[timer->interval].count++;
@ -78,6 +82,10 @@ static inline switch_status_t timer_step(switch_timer_t *timer)
{ {
timer_private_t *private_info = timer->private_info; timer_private_t *private_info = timer->private_info;
if (globals.RUNNING != 1) {
return SWITCH_STATUS_FALSE;
}
private_info->reference += timer->interval; private_info->reference += timer->interval;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -88,11 +96,17 @@ static inline switch_status_t timer_next(switch_timer_t *timer)
timer_private_t *private_info = timer->private_info; timer_private_t *private_info = timer->private_info;
timer_step(timer); timer_step(timer);
while (TIMER_MATRIX[timer->interval].tick < private_info->reference) {
while (globals.RUNNING == 1 && TIMER_MATRIX[timer->interval].tick < private_info->reference) {
switch_yield(1000); switch_yield(1000);
} }
timer->samplecount += timer->samples;
return SWITCH_STATUS_SUCCESS; if (globals.RUNNING == 1) {
timer->samplecount += timer->samples;
return SWITCH_STATUS_SUCCESS;
}
return SWITCH_STATUS_FALSE;
} }
static inline switch_status_t timer_check(switch_timer_t *timer) static inline switch_status_t timer_check(switch_timer_t *timer)
@ -102,6 +116,10 @@ static inline switch_status_t timer_check(switch_timer_t *timer)
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
uint64_t diff; uint64_t diff;
if (globals.RUNNING != 1) {
return SWITCH_STATUS_SUCCESS;
}
if (TIMER_MATRIX[timer->interval].tick < private_info->reference) { if (TIMER_MATRIX[timer->interval].tick < private_info->reference) {
diff = private_info->reference - TIMER_MATRIX[timer->interval].tick; diff = private_info->reference - TIMER_MATRIX[timer->interval].tick;
} else { } else {