From 87dadf3b8cd9b8bd2d5a5ba1a5009e289447f08a Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 28 Jun 2011 21:23:40 +0000 Subject: * 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 --- ChangeLog | 6 ++++++ thread_pthread.c | 9 ++++++--- 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 + + * 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 * 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; -- cgit v1.2.3