luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-18 19:51:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors in the recently moved time calculations. (#395203, Chris

Browse Source 
2007-01-12  Matthias Clasen  <mclasen@redhat.com>

        * gthread/gthread-posix.c:
        * glib/gtimer.c:
        * glib/gthread.c: Fix errors in the recently moved
        time calculations.  (#395203, Chris Wilson)



svn path=/trunk/; revision=5244
This commit is contained in:
Matthias Clasen 2007-01-12 05:55:16 +00:00 committed by Matthias Clasen
parent a0c1c3b14e
commit 2c7dbe9c73
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-01-12 Matthias Clasen <mclasen@redhat.com>
* gthread/gthread-posix.c:
* glib/gtimer.c:
* glib/gthread.c: Fix errors in the recently moved
time calculations. (#395203, Chris Wilson)
2007-01-10 Matthias Clasen <mclasen@redhat.com> 2007-01-10 Matthias Clasen <mclasen@redhat.com>
* configure.in: Actually link gthread against librt. * configure.in: Actually link gthread against librt.

2
glib/gthread.c
View File

@ -557,7 +557,7 @@ gettime (void)
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
return tv.tv_sec * 1e9 + tv.tv_usec * 1000; return (guint64) tv.tv_sec * 1000000000 + tv.tv_usec * 1000;
#endif #endif
} }

4
glib/gtimer.c
View File

@ -149,10 +149,10 @@ g_timer_elapsed (GTimer *timer,
elapsed = timer->end - timer->start; elapsed = timer->end - timer->start;
total = elapsed / 1e7; total = elapsed / 1e9;
if (microseconds) if (microseconds)
*microseconds = (elapsed / 10) % 1000000; *microseconds = (elapsed / 1000) % 1000000;
return total; return total;
} }

5
gthread/gthread-posix.c
View File

@ -429,18 +429,19 @@ g_thread_equal_posix_impl (gpointer thread1, gpointer thread2)
static guint64 static guint64
g_gettime_posix_impl (void) g_gettime_posix_impl (void)
{ {
#define G_NSEC_PER_SEC 100000000000
#ifdef USE_CLOCK_GETTIME #ifdef USE_CLOCK_GETTIME
struct timespec tv; struct timespec tv;
clock_gettime (posix_clock, &tv); clock_gettime (posix_clock, &tv);
return tv.tv_sec * 1e9 + tv.tv_nsec; return (guint64) tv.tv_sec * G_NSEC_PER_SEC + tv.tv_nsec;
#else #else
struct timeval tv; struct timeval tv;
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
return tv.tv_sec * 1e9 + tv.tv_usec * 1000; return (guint64) tv.tv_sec * G_NSEC_PER_SEC + tv.tv_usec * 1000;
#endif #endif
} }