* thread_pthread.c (thread_timer): add to care a spurious wakeup.

  When native_cond_timedwait() return 0 by spurious wakeup, we
  don't have to neither 1) call timer_thread_function and 2)
  exit the timer thread.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 9 deletions

diff --git a/thread_pthread.c b/thread_pthread.c
index 11bf098bf7..4ada057068 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -993,27 +993,33 @@ static void *
 thread_timer(void *dummy)
 {
     struct timespec timeout_10ms;
+    struct timespec timeout;
 
     timeout_10ms.tv_sec = 0;
     timeout_10ms.tv_nsec = 10 * 1000 * 1000;
 
     native_mutex_lock(&timer_thread_lock);
     native_cond_broadcast(&timer_thread_cond);
+    timeout = native_cond_timeout(&timer_thread_cond, timeout_10ms);
+
     while (system_working > 0) {
 	int err;
-	struct timespec timeout;
 
-	timeout = native_cond_timeout(&timer_thread_cond, timeout_10ms);
 	err = native_cond_timedwait(&timer_thread_cond, &timer_thread_lock,
 				    &timeout);
-	if (err == ETIMEDOUT);
-	else if (err == 0) {
-	    if (rb_signal_buff_size() == 0) break;
+	if (err == 0) {
+	    /*
+	     * Spurious wakeup or native_stop_timer_thread() was called.
+	     * We need to recheck a system_working state.
+	     */
 	}
-	else rb_bug_errno("thread_timer/timedwait", err);
-
-	ping_signal_thread_list();
-	timer_thread_function(dummy);
+	else if (err == ETIMEDOUT) {
+	    ping_signal_thread_list();
+	    timer_thread_function(dummy);
+	    timeout = native_cond_timeout(&timer_thread_cond, timeout_10ms);
+	}
+	else
+	    rb_bug_errno("thread_timer/timedwait", err);
     }
     native_mutex_unlock(&timer_thread_lock);
     return NULL;