dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I had a weird timing glitch when running mstpcap which I think was caused by a truncation error in timer.c so I've made some slight changes to try stop it happening again.

Browse Source
This commit is contained in:
petermcs
2012-04-30 08:31:41 +00:00
parent 8017610632
commit 44055ff37f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/win32/timer.c
+2 -2
View File
@@ -84,7 +84,7 @@ int gettimeofday(
/* a 64-bit value representing the number of /* a 64-bit value representing the number of
100-nanosecond intervals since January 1, 1601 (UTC). */ 100-nanosecond intervals since January 1, 1601 (UTC). */
GetSystemTimeAsFileTime(&ft); GetSystemTimeAsFileTime(&ft);
usec_timer |= ft.dwHighDateTime; usec_timer = ft.dwHighDateTime;
usec_timer <<= 32; usec_timer <<= 32;
usec_timer |= ft.dwLowDateTime; usec_timer |= ft.dwLowDateTime;
/*converting file time to unix epoch 1970 */ /*converting file time to unix epoch 1970 */
@@ -95,7 +95,7 @@ int gettimeofday(
time_start = timeGetTime(); time_start = timeGetTime();
} else { } else {
elapsed_milliseconds = timeGetTime() - time_start; elapsed_milliseconds = timeGetTime() - time_start;
usec_elapsed = usec_timer + (elapsed_milliseconds * 1000UL); usec_elapsed = usec_timer + ((LONGLONG)elapsed_milliseconds * 1000UL);
tp->tv_sec = (long) (usec_elapsed / 1000000UL); tp->tv_sec = (long) (usec_elapsed / 1000000UL);
tp->tv_usec = (long) (usec_elapsed % 1000000UL); tp->tv_usec = (long) (usec_elapsed % 1000000UL);
} }