summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-28 21:23:40 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-28 21:23:40 +0000
commit87dadf3b8cd9b8bd2d5a5ba1a5009e289447f08a (patch)
tree952ca51d3c87a3fe44d9a13639037eca88702d79
parente9c1783bbd3d1acbc53bd20bcb6cfe62dc4af5ba (diff)
downloadruby-87dadf3b8cd9b8bd2d5a5ba1a5009e289447f08a.tar.gz
* thread_pthread.c (native_stop_timer_thread): skip to close
communication pipe to avoid timing bug (process termination timing). The communication pipe will closed by OS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--thread_pthread.c9
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e6e27ad1c2..db41807b12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 29 06:21:02 2011 Koichi Sasada <ko1@atdot.net>
+
+ * thread_pthread.c (native_stop_timer_thread): skip to close
+ communication pipe to avoid timing bug (process termination timing).
+ The communication pipe will closed by OS.
+
Wed Jun 29 06:09:54 2011 Koichi Sasada <ko1@atdot.net>
* error.c (rb_async_bug_errno): async-safe bug report function.
diff --git a/thread_pthread.c b/thread_pthread.c
index 420a3f4db5..016ee32abb 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1189,10 +1189,13 @@ native_stop_timer_thread(int close_anyway)
/* close communication pipe */
if (close_anyway) {
/* TODO: Uninstall all signal handlers or mask all signals.
- * This pass is cleaning phase. It is too rare case
- * to generate problem, so we remains it in TODO.
+ * This pass is cleaning phase (terminate ruby process).
+ * To avoid such race, we skip to close communication
+ * pipe. OS will close it at process termination.
+ * It may not good practice, but pragmatic.
+ * We remain it is TODO.
*/
- close_communication_pipe();
+ /* close_communication_pipe(); */
}
}
return stopped;