1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix my_hrtime() on Windows to return microseconds since Unix epoch.

Browse Source 
Prior to this patch it returned microseconds since 1 Jan 1601 (Windows epoch)
This commit is contained in:
Vladislav Vaintroub 2011-04-19 19:28:23 +02:00
parent a7ff7918a0
commit 5346cb8d27
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysys/my_getsystime.c
View File

@ -26,6 +26,7 @@
#include <nks/time.h> #include <nks/time.h>
#elif defined(__WIN__) #elif defined(__WIN__)
static ulonglong query_performance_frequency, query_performance_offset; static ulonglong query_performance_frequency, query_performance_offset;
#define OFFSET_TO_EPOC 116444736000000000LL
#elif defined(HAVE_GETHRTIME) #elif defined(HAVE_GETHRTIME)
static ulonglong gethrtime_offset; static ulonglong gethrtime_offset;
#endif #endif
@ -81,6 +82,7 @@ my_hrtime_t my_hrtime()
#if defined(__WIN__) #if defined(__WIN__)
ulonglong newtime; ulonglong newtime;
GetSystemTimeAsFileTime((FILETIME*)&newtime); GetSystemTimeAsFileTime((FILETIME*)&newtime);
newtime -= OFFSET_TO_EPOC;
hrtime.val= newtime/10; hrtime.val= newtime/10;
#elif defined(HAVE_GETHRTIME) #elif defined(HAVE_GETHRTIME)
struct timeval t; struct timeval t;
@ -117,7 +119,6 @@ void my_diff_and_hrtime(my_timediff_t *interval, my_hrtime_t *timestamp)
void my_time_init() void my_time_init()
{ {
#ifdef __WIN__ #ifdef __WIN__
#define OFFSET_TO_EPOC ((__int64) 134774 * 24 * 60 * 60 * 1000 * 1000 * 10)
FILETIME ft; FILETIME ft;
LARGE_INTEGER li, t_cnt; LARGE_INTEGER li, t_cnt;
DBUG_ASSERT(sizeof(LARGE_INTEGER) == sizeof(query_performance_frequency)); DBUG_ASSERT(sizeof(LARGE_INTEGER) == sizeof(query_performance_frequency));