mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed problem in my_micro_time_and_time().

Browse source
This commit is contained in:
jani@hynda.mysql.fi 2007-11-08 13:25:26 +02:00
parent e8d8102a93
commit 43dda9cec8
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mysys/my_getsystime.c
View file

@ -17,6 +17,11 @@
/* thus to get the current time we should use the system function /* thus to get the current time we should use the system function
with the highest possible resolution */ with the highest possible resolution */
/*
TODO: in functions my_micro_time() and my_micro_time_and_time() there
exists some common code that should be merged into a function.
*/
#include "mysys_priv.h" #include "mysys_priv.h"
#include "my_static.h" #include "my_static.h"
@ -113,7 +118,7 @@ ulonglong my_micro_time()
query_performance_frequency)); query_performance_frequency));
} }
else else
newtime= (GetTickCount() * 1000); /* GetTickCount only returns milliseconds */ newtime= (GetTickCount() * 1000); /* GetTickCount only returns millisec */
return newtime; return newtime;
#elif defined(HAVE_GETHRTIME) #elif defined(HAVE_GETHRTIME)
return gethrtime()/1000; return gethrtime()/1000;
@ -161,7 +166,9 @@ ulonglong my_micro_time_and_time(time_t *time_arg)
if (query_performance_frequency) if (query_performance_frequency)
{ {
QueryPerformanceCounter((LARGE_INTEGER*) &newtime); QueryPerformanceCounter((LARGE_INTEGER*) &newtime);
newtime/= (query_performance_frequency * 1000000); return ((newtime / query_performance_frequency * 10000000) +
(newtime % query_performance_frequency * 10000000 /
query_performance_frequency));
} }
else else
newtime= (GetTickCount() * 1000); /* GetTickCount only returns millisec. */ newtime= (GetTickCount() * 1000); /* GetTickCount only returns millisec. */