[前][次][番号順一覧][スレッド一覧]

ruby-changes:17946

From: ko1 <ko1@a...>
Date: Sun, 28 Nov 2010 21:55:52 +0900 (JST)
Subject: [ruby-changes:17946] Ruby:r29962 (trunk): * thread_pthread.c (native_cond_*): Check return code.

ko1	2010-11-28 21:55:43 +0900 (Sun, 28 Nov 2010)

  New Revision: 29962

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

  Log:
    * thread_pthread.c (native_cond_*): Check return code.
      (Some OSs except Linux return error code).

  Modified files:
    trunk/ChangeLog
    trunk/thread_pthread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29961)
+++ ChangeLog	(revision 29962)
@@ -1,3 +1,8 @@
+Mon Nov 29 05:54:22 2010  Koichi Sasada  <ko1@a...>
+
+	* thread_pthread.c (native_cond_*): Check return code.
+	  (Some OSs except Linux return error code).
+
 Sun Nov 28 21:46:21 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c (thread_start_func_1): initialize native thread
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 29961)
+++ thread_pthread.c	(revision 29962)
@@ -259,25 +259,38 @@
 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;
 }
 
 static void

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

[前][次][番号順一覧][スレッド一覧]