From 90c6c35f2e80de05fa123ce5e28b8a1cd5241be3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 6 Nov 2008 22:12:20 +0000
Subject: [PATCH] * thread_pthread.c (thread_timer): uses
 pthread_cond_timedwait always   instead of pthread_kill.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        |  5 +++++
 thread_pthread.c | 27 ---------------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4c2f4a33f..6b8546cedd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov  7 07:12:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (thread_timer): uses pthread_cond_timedwait always
+	  instead of pthread_kill.
+
 Fri Nov  7 04:02:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* thread.c (thread_timer): uses timedwait on cygwin.
diff --git a/thread_pthread.c b/thread_pthread.c
index 601a060fc8..d7d1eb52f9 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -649,14 +649,6 @@ remove_signal_thread_list(rb_thread_t *th)
 }
 
 static pthread_t timer_thread_id;
-
-#ifdef __CYGWIN__
-#define TIMER_USE_TIMEDWAIT 1
-#endif
-#ifndef TIMER_USE_TIMEDWAIT
-#define TIMER_USE_TIMEDWAIT 0
-#endif
-#if TIMER_USE_TIMEDWAIT
 static pthread_cond_t timer_thread_cond = PTHREAD_COND_INITIALIZER;
 
 static struct timespec *
@@ -672,28 +664,15 @@ get_ts(struct timespec *ts, unsigned long nsec)
     }
     return ts;
 }
-#endif
 
 static void *
 thread_timer(void *dummy)
 {
-#if TIMER_USE_TIMEDWAIT
     struct timespec ts;
     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)
-#elif defined HAVE_NANOSLEEP
-    struct timespec req, rem;
-    req.tv_sec = 0;
-    req.tv_nsec = 10 * 1000 * 1000;	/* 10 ms */
-#define WAIT_FOR_10MS() (nanosleep(&req, &rem) != -1)
-#else
-    struct timeval tv;
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000;     	/* 10 ms */
-#define WAIT_FOR_10MS() (select(0, NULL, NULL, NULL, &tv) != -1)
-#endif
     while (WAIT_FOR_10MS()) {
 #ifndef __CYGWIN__
 	if (signal_thread_list_anchor.next) {
@@ -709,10 +688,8 @@ thread_timer(void *dummy)
 #endif
 	timer_thread_function(dummy);
     }
-#if TIMER_USE_TIMEDWAIT
     pthread_mutex_unlock(&lock);
     pthread_mutex_destroy(&lock);
-#endif
     return NULL;
 }
 
@@ -738,10 +715,6 @@ rb_thread_create_timer_thread(void)
     rb_disable_interrupt(); /* only timer thread recieve signal */
 }
 
-#if TIMER_USE_TIMEDWAIT
 #define native_stop_timer_thread() pthread_cond_signal(&timer_thread_cond)
-#else
-#define native_stop_timer_thread() pthread_kill(timer_thread_id, SIGTERM)
-#endif
 
 #endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */