com php-src: improved system time function determination: win32/time.c
| From: | Anatol Belski | Date: | Tue, 23 Dec 2014 12:00:30 +0000 |
| Subject: | com php-src: improved system time function determination: win32/time.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83837@lists.php.net to get a copy of this message | ||
Commit: bc33171ac639381cd6a04d46a069290b468b4270
Author: Anatol Belski <ab@php.net> Tue, 23 Dec 2014 12:02:36 +0100
Parents: e60b7207db5e3611c8c613ff986a524b62e6eb7d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc33171ac639381cd6a04d46a069290b468b4270
Log:
improved system time function determination
It doesn't need to LoadLibrary and all that stuff every time, but
once on the first access. Also the functions which are not directly
used inlined now.
Changed paths:
M win32/time.c
Diff:
diff --git a/win32/time.c b/win32/time.c
index 7553974..9b5030a 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -27,7 +27,9 @@
typedef VOID (WINAPI *MyGetSystemTimeAsFileTime)(LPFILETIME lpSystemTimeAsFileTime);
-static MyGetSystemTimeAsFileTime get_time_func(void)
+static MyGetSystemTimeAsFileTime timefunc = NULL;
+
+static zend_always_inline MyGetSystemTimeAsFileTime get_time_func(void)
{
MyGetSystemTimeAsFileTime timefunc = NULL;
HMODULE hMod = LoadLibrary("kernel32.dll");
@@ -45,19 +47,16 @@ static MyGetSystemTimeAsFileTime get_time_func(void)
return timefunc;
}
-int getfilesystemtime(struct timeval *tv)
+static zend_always_inline int getfilesystemtime(struct timeval *tv)
{
FILETIME ft;
unsigned __int64 ff = 0;
- MyGetSystemTimeAsFileTime timefunc;
ULARGE_INTEGER fft;
- timefunc = get_time_func();
- if (timefunc) {
- timefunc(&ft);
- } else {
- GetSystemTimeAsFileTime(&ft);
+ if (!timefunc) {
+ timefunc = get_time_func();
}
+ timefunc(&ft);
/*
* Do not cast a pointer to a FILETIME structure to either a