shyouhei	2009-01-07 10:09:10 +0900 (Wed, 07 Jan 2009)

  New Revision: 21357

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21357

  Log:
    merge revision(s) 18355:
    * eval.c (timeofday): use monotonic clock.  based on a patch
      from zimbatm <zimbatm@o...> in [ruby-core:16627].

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/configure.in
    branches/ruby_1_8_6/eval.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/configure.in
===================================================================
--- ruby_1_8_6/configure.in	(revision 21356)
+++ ruby_1_8_6/configure.in	(revision 21357)
@@ -472,6 +472,7 @@
 AC_CHECK_LIB(crypt, crypt)
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+AC_CHECK_LIB(rt, clock_gettime)	# GNU/Linux
 
 case "$target_cpu" in
 alpha*)		case "$target_os"::"$GCC" in
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21356)
+++ ruby_1_8_6/ChangeLog	(revision 21357)
@@ -1,3 +1,8 @@
+Wed Jan  7 10:06:12 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (timeofday): use monotonic clock.  based on a patch
+	  from zimbatm <zimbatm@o...> in [ruby-core:16627].
+
 Tue Jan  6 09:02:14 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (yylex): 8 and 9 in octal integer should cause compile
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21356)
+++ ruby_1_8_6/version.h	(revision 21357)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-06"
+#define RUBY_RELEASE_DATE "2009-01-07"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090106
-#define RUBY_PATCHLEVEL 291
+#define RUBY_RELEASE_CODE 20090107
+#define RUBY_PATCHLEVEL 292
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 7
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/eval.c
===================================================================
--- ruby_1_8_6/eval.c	(revision 21356)
+++ ruby_1_8_6/eval.c	(revision 21357)
@@ -72,6 +72,8 @@
 #include <unistd.h>
 #endif
 
+#include <time.h>
+
 #ifdef __BEOS__
 #include <net/socket.h>
 #endif
@@ -10080,6 +10082,13 @@
 timeofday()
 {
     struct timeval tv;
+#ifdef CLOCK_MONOTONIC
+    struct timespec tp;
+
+    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+	return (double)tp.tv_sec + (double)tp.tv_nsec * 1e-9;
+    }
+#endif
     gettimeofday(&tv, NULL);
     return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/