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

Correct the gettime calculations once more. (#395203, Chris Wilson)

Browse Source 
2005-01-15  Matthias Clasen  <mclasen@redhat.com>

        * glib/gthread.c:
        * gthread/gthread-posix.c: Correct the gettime calculations
        once more.  (#395203, Chris Wilson)



svn path=/trunk/; revision=5262
This commit is contained in:
Matthias Clasen 2007-01-15 03:34:42 +00:00 committed by Matthias Clasen
parent daeff90d19
commit a74d6b9582
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-01-15 Matthias Clasen <mclasen@redhat.com>
* glib/gthread.c:
* gthread/gthread-posix.c: Correct the gettime calculations
once more. (#395203, Chris Wilson)
2007-01-15 Tor Lillqvist <tml@novell.com>
* glib/gmain.h (struct _GPollFD): Prepare for potential Win64

4
glib/gthread.c
View File

@ -546,6 +546,8 @@ g_thread_fail (void)
g_error ("The thread system is not yet initialized.");
}
#define G_NSEC_PER_SEC 1000000000
static guint64
gettime (void)
{
@ -560,7 +562,7 @@ gettime (void)
gettimeofday (&tv, NULL);
return (guint64) tv.tv_sec * 1000000000 + tv.tv_usec * 1000;
return (guint64) tv.tv_sec * G_NSEC_PER_SEC + tv.tv_usec * (G_NSEC_PER_SEC / G_USEC_PER_SEC);
#endif
}

3
gthread/gthread-posix.c
View File

@ -429,7 +429,6 @@ g_thread_equal_posix_impl (gpointer thread1, gpointer thread2)
static guint64
g_gettime_posix_impl (void)
{
#define G_NSEC_PER_SEC 100000000000
#ifdef USE_CLOCK_GETTIME
struct timespec tv;
@ -441,7 +440,7 @@ g_gettime_posix_impl (void)
gettimeofday (&tv, NULL);
return (guint64) tv.tv_sec * G_NSEC_PER_SEC + tv.tv_usec * 1000;
return (guint64) tv.tv_sec * G_NSEC_PER_SEC + tv.tv_usec * (G_NSEC_PER_SEC / G_USEC_PER_SEC);
#endif
}