From 32d4fcdc92ebf85c90ab53d9a7743f884e3a623a Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 20 Dec 2010 13:23:17 +0000
Subject: [PATCH] merges r29962 from trunk into ruby_1_9_2. -- *
 thread_pthread.c (native_cond_*): Check return code.   (Some OSs except Linux
 return error code).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        |  5 +++++
 thread_pthread.c | 21 +++++++++++++++++----
 version.h        |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce942e742d..a4312c24e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 29 05:54:22 2010  Koichi Sasada  <ko1@atdot.net>
+
+	* thread_pthread.c (native_cond_*): Check return code.
+	  (Some OSs except Linux return error code).
+
 Sat Nov 27 19:12:10 2010  Tanaka Akira  <akr@fsij.org>
 
 	* time.c: parenthesize macro arguments.
diff --git a/thread_pthread.c b/thread_pthread.c
index c2fde5c82e..f7c5c2b8ec 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -106,25 +106,38 @@ native_cond_destroy(pthread_cond_t *cond)
 static void
 native_cond_signal(pthread_cond_t *cond)
 {
-    pthread_cond_signal(cond);
+    int r = pthread_cond_signal(cond);
+    if (r != 0) {
+	rb_bug_errno("pthread_cond_signal", r);
+    }
 }
 
 static void
 native_cond_broadcast(pthread_cond_t *cond)
 {
-    pthread_cond_broadcast(cond);
+    int r = pthread_cond_broadcast(cond);
+    if (r != 0) {
+	rb_bug_errno("native_cond_broadcast", r);
+    }
 }
 
 static void
 native_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
 {
-    pthread_cond_wait(cond, mutex);
+    int r = pthread_cond_wait(cond, mutex);
+    if (r != 0) {
+	rb_bug_errno("pthread_cond_wait", r);
+    }
 }
 
 static int
 native_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *ts)
 {
-    return pthread_cond_timedwait(cond, mutex, ts);
+    int r = pthread_cond_timedwait(cond, mutex, ts);
+    if (r != 0 && r != ETIMEDOUT && r != EINTR /* Linux */) {
+	rb_bug_errno("pthread_cond_timedwait", r);
+    }
+    return r;
 }
 
 
diff --git a/version.h b/version.h
index fb4ac70ead..08f31c328c 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 109
+#define RUBY_PATCHLEVEL 110
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1