kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

fix a bunch of stuff

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7854 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2008-03-11 03:45:16 +00:00
parent dc5c28e1f9
commit 74a3d8ab95
17 changed files with 139 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/switch_time.c
View File

@@ -58,7 +58,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown);
SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime);
SWITCH_MODULE_DEFINITION(CORE_SOFTTIMER_MODULE, softtimer_load, softtimer_shutdown, softtimer_runtime);
#define MAX_ELEMENTS 360
#define MAX_ELEMENTS 3600
#define IDLE_SPEED 100
#define STEP_MS 1
#define STEP_MIC 1000
@@ -202,7 +202,7 @@ static switch_status_t timer_step(switch_timer_t *timer)
}
timer->samplecount = (uint32_t) samples;
private_info->reference++;
private_info->reference = TIMER_MATRIX[timer->interval].tick + 1;
return SWITCH_STATUS_SUCCESS;
}
@@ -217,7 +217,7 @@ static switch_status_t timer_next(switch_timer_t *timer)
check_roll();
switch_yield(1000);
}
if (globals.RUNNING == 1) {
return SWITCH_STATUS_SUCCESS;
}
@@ -230,7 +230,6 @@ static switch_status_t timer_check(switch_timer_t *timer)
timer_private_t *private_info = timer->private_info;
switch_status_t status = SWITCH_STATUS_SUCCESS;
if (globals.RUNNING != 1 || !private_info->ready) {
return SWITCH_STATUS_SUCCESS;
}
@@ -340,20 +339,25 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
tick = 0;
}
for (x = 1; x <= MAX_ELEMENTS; x++) {
int i = x * 10;
int index = (current_ms % i == 0) ? i : 0;
for (x = 0; x <= MAX_ELEMENTS; x++) {
int i = x, index;
if (i == 0) {
i = 1;
}
index = (current_ms % i == 0) ? i : 0;
if (TIMER_MATRIX[index].count) {
TIMER_MATRIX[index].tick++;
if (TIMER_MATRIX[index].tick == MAX_TICK) {
TIMER_MATRIX[index].tick = 0;
TIMER_MATRIX[index].roll++;
if (TIMER_MATRIX[x].tick == MAX_TICK) {
TIMER_MATRIX[x].tick = 0;
TIMER_MATRIX[x].roll++;
}
}
}
if (current_ms == MAX_ELEMENTS) {
current_ms = 0;
}