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

FS-4387 --resolve

This commit is contained in:
Jeff Lenk 2012-07-04 23:06:32 -05:00
parent 04bd463d12
commit 939a26764f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_time.c
View File

@ -442,7 +442,13 @@ static switch_time_t time_now(int64_t offset)
SWITCH_DECLARE(switch_time_t) switch_time_ref(void) SWITCH_DECLARE(switch_time_t) switch_time_ref(void)
{ {
return time_now(0); if (SYSTEM_TIME) {
/* Return system time reference */
return time_now(0);
} else {
/* Return monotonic time reference (when available) */
return time_now(-1);
}
} }
static switch_time_t last_time = 0; static switch_time_t last_time = 0;
@ -458,7 +464,7 @@ SWITCH_DECLARE(void) switch_time_sync(void)
runtime.mono_reference = time_now(-1); runtime.mono_reference = time_now(-1);
runtime.offset = 0; runtime.offset = 0;
} else { } else {
runtime.offset = runtime.reference - time_now(0); runtime.offset = runtime.reference - time_now(-1); /* Get the offset between system time and the monotonic clock (when available) */
runtime.reference = time_now(runtime.offset); runtime.reference = time_now(runtime.offset);
} }
@ -844,7 +850,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
if (MONO) { if (MONO) {
int loops; int loops;
for (loops = 0; loops < 3; loops++) { for (loops = 0; loops < 3; loops++) {
ts = time_now(0); ts = switch_time_ref();
/* if it returns the same value every time it won't be of much use. */ /* if it returns the same value every time it won't be of much use. */
if (ts == last) { if (ts == last) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Broken MONOTONIC Clock Detected!, Support Disabled.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Broken MONOTONIC Clock Detected!, Support Disabled.\n");
@ -1287,6 +1293,8 @@ SWITCH_MODULE_LOAD_FUNCTION(softtimer_load)
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabled Windows monotonic clock, using timeGetTime()\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabled Windows monotonic clock, using timeGetTime()\n");
} }
runtime.mono_initiated = switch_mono_micro_time_now(); /* Update mono_initiated, since now is the first time the real clock is enabled */
} }
/* No need to calibrate clock in Win32, we will only sleep ms anyway, it's just not accurate enough */ /* No need to calibrate clock in Win32, we will only sleep ms anyway, it's just not accurate enough */