luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the timestamp generation for pthread-win32 timed waits 

Issue: we have to use WIN API functions which deliver times in a 
different way. In order to make the wait functions work, we have to use 
the same time definition - specifically the same zero time.
This commit is contained in:
Matthias Köfferlein 2018-09-09 18:30:21 +02:00
parent 28477af15e
commit 940a96716c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tl/tl/tlTimer.cc
View File

@ -49,6 +49,12 @@ namespace tl
// ------------------------------------------------------------- // -------------------------------------------------------------
#if defined(_MSC_VER)
// FILETIME and Posix use different zero time. This is the difference
// between Jan 1, 1601 and Jan 1, 1970. This value is taken from pthread-win32.
const uint64_t ft_to_epoch_offset = uint64_t (11644473600) * uint64_t (10000000);
#endif
void current_utc_time (struct timespec *ts) void current_utc_time (struct timespec *ts)
{ {
@ -68,6 +74,8 @@ void current_utc_time (struct timespec *ts)
GetSystemTimeAsFileTime (&ft); GetSystemTimeAsFileTime (&ft);
uint64_t t = (uint64_t (ft.dwHighDateTime) << (sizeof (ft.dwHighDateTime) * 8)) | uint64_t (ft.dwLowDateTime); uint64_t t = (uint64_t (ft.dwHighDateTime) << (sizeof (ft.dwHighDateTime) * 8)) | uint64_t (ft.dwLowDateTime);
t -= ft_to_epoch_offset;
// t is in 100ns units // t is in 100ns units
ts->tv_nsec = (t % 10000000) * 100; ts->tv_nsec = (t % 10000000) * 100;
ts->tv_sec = (t / 10000000); ts->tv_sec = (t / 10000000);
@ -96,7 +104,10 @@ static int64_t ms_time ()
FILETIME ft; FILETIME ft;
GetSystemTimeAsFileTime (&ft); GetSystemTimeAsFileTime (&ft);
uint64_t t = (uint64_t (ft.dwHighDateTime) << (sizeof (ft.dwHighDateTime) * 8)) | uint64_t (ft.dwLowDateTime); uint64_t t = (uint64_t (ft.dwHighDateTime) << (sizeof (ft.dwHighDateTime) * 8)) | uint64_t (ft.dwLowDateTime);
t -= ft_to_epoch_offset;
// FILETIME uses 100ns resolution, hence divide by 10000 to get ms: // FILETIME uses 100ns resolution, hence divide by 10000 to get ms:
return int64_t (t / 10000); return int64_t (t / 10000);