nobu	2008-11-07 07:43:30 +0900 (Fri, 07 Nov 2008)

  New Revision: 20127

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

  Log:
    * thread.c (thread_timer): pthread_cond_timedwait returns ETIMEDOUT
      when timed out.

  Modified files:
    trunk/ChangeLog
    trunk/thread_pthread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20126)
+++ ChangeLog	(revision 20127)
@@ -1,3 +1,8 @@
+Fri Nov  7 07:43:27 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread.c (thread_timer): pthread_cond_timedwait returns ETIMEDOUT
+	  when timed out.
+
 Fri Nov  7 07:32:55 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/yaml/rubytypes.rb: support Rational and Complex as 1.8
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 20126)
+++ thread_pthread.c	(revision 20127)
@@ -672,7 +672,7 @@
     static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 
     pthread_mutex_lock(&lock);
-#define WAIT_FOR_10MS() (pthread_cond_timedwait(&timer_thread_cond, &lock, get_ts(&ts, PER_NANO/100)) == 0)
+#define WAIT_FOR_10MS() (pthread_cond_timedwait(&timer_thread_cond, &lock, get_ts(&ts, PER_NANO/100)) == ETIMEDOUT)
     while (WAIT_FOR_10MS()) {
 #ifndef __CYGWIN__
 	if (signal_thread_list_anchor.next) {

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