luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify, use GetSystemTimeAsFileTime().

Browse Source 
2000-08-31  Tor Lillqvist  <tml@iki.fi>

	* gmain.c (g_get_current_time): (Win32): Simplify, use
	GetSystemTimeAsFileTime().
This commit is contained in:
Tor Lillqvist 2000-08-31 20:55:16 +00:00 committed by Tor Lillqvist
parent 55cd16c993
commit a7e60b7576
10 changed files with 54 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2000-08-31 Tor Lillqvist <tml@iki.fi>
* gmain.c (g_get_current_time): (Win32): Simplify, use
GetSystemTimeAsFileTime().
2000-08-27 Tor Lillqvist <tml@iki.fi>
* giowin32.c (g_io_channel_win32_poll): New function, otherwise

25
glib/gmain.c
View File

@ -629,26 +629,15 @@ g_get_current_time (GTimeVal *result)
result->tv_sec = r.tv_sec;
result->tv_usec = r.tv_usec;
#else
/* Avoid calling time() except for the first time.
* GetTickCount() should be pretty fast and low-level?
* I could also use ftime() but it seems unnecessarily overheady.
*/
static DWORD start_tick = 0;
static time_t start_time;
DWORD tick;
FILETIME filetime;
gint64 t;
g_return_if_fail (result != NULL);
if (start_tick == 0)
{
start_tick = GetTickCount ();
time (&start_time);
}
GetSystemTimeAsFileTime (&filetime);
t = ((gint64) filetime.dwLowDateTime) +
((gint64) filetime.dwHighDateTime) * G_GINT64_CONSTANT (0x100000000);
tick = GetTickCount ();
result->tv_sec = (tick - start_tick) / 1000 + start_time;
result->tv_usec = ((tick - start_tick) % 1000) * 1000;
result->tv_sec = (t - G_GINT64_CONSTANT (0x19db1ded53e8000)) / 10000000;
result->tv_usec = (t % 10000000) / 10;
#endif
}

25
gmain.c
View File

@ -629,26 +629,15 @@ g_get_current_time (GTimeVal *result)
result->tv_sec = r.tv_sec;
result->tv_usec = r.tv_usec;
#else
/* Avoid calling time() except for the first time.
* GetTickCount() should be pretty fast and low-level?
* I could also use ftime() but it seems unnecessarily overheady.
*/
static DWORD start_tick = 0;
static time_t start_time;
DWORD tick;
FILETIME filetime;
gint64 t;
g_return_if_fail (result != NULL);
if (start_tick == 0)
{
start_tick = GetTickCount ();
time (&start_time);
}
GetSystemTimeAsFileTime (&filetime);
t = ((gint64) filetime.dwLowDateTime) +
((gint64) filetime.dwHighDateTime) * G_GINT64_CONSTANT (0x100000000);
tick = GetTickCount ();
result->tv_sec = (tick - start_tick) / 1000 + start_time;
result->tv_usec = ((tick - start_tick) % 1000) * 1000;
result->tv_sec = (t - G_GINT64_CONSTANT (0x19db1ded53e8000)) / 10000000;
result->tv_usec = (t % 10000000) / 10;
#endif
}