2 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 643291e67b..ff5100254b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May  9 19:16:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (timeofday): use monotonic clock.  based on a patch
+	  from zimbatm <zimbatm@oree.ch> in [ruby-core:16627].
+
 Fri May  9 07:47:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* cont.c (cont_restore_0): dynamic stack direction code should be
diff --git a/thread.c b/thread.c
index f7a4b8ba7a..21d43edc27 100644
--- a/thread.c
+++ b/thread.c
@@ -674,9 +674,18 @@ rb_thread_sleep_forever()
 static double
 timeofday(void)
 {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
+#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
+    struct timespec tp;
+
+    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+        return (double)tp.tv_sec + (double)tp.tv_nsec * 1e-9;
+    } else
+#endif
+    {
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+        return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
+    }
 }
 
 static void