ruby-changes:20477
From: kosaki <ko1@a...>
Date: Tue, 12 Jul 2011 14:12:38 +0900 (JST)
Subject: [ruby-changes:20477] kosaki:r32525 (trunk): small cleanup
kosaki 2011-07-12 14:12:29 +0900 (Tue, 12 Jul 2011) New Revision: 32525 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32525 Log: small cleanup Modified files: trunk/signal.c Index: signal.c =================================================================== --- signal.c (revision 32524) +++ signal.c (revision 32525) @@ -1021,31 +1021,15 @@ init_sigchld(int sig) { sighandler_t oldfunc; -#if USE_TRAP_MASK - sigset_t mask; - sigset_t fullmask; - /* - * disable interrupt. Otherwise following temmporal signal handler change - * has a race. - * Note: now we have only single thread, therefore both sigprocmask() and - * pthread_sigmask() makes the same effect. - */ - sigfillset(&fullmask); - pthread_sigmask(SIG_BLOCK, &fullmask, &mask); -#endif - + rb_disable_interrupt(); oldfunc = ruby_signal(sig, SIG_DFL); if (oldfunc != SIG_DFL && oldfunc != SIG_IGN) { ruby_signal(sig, oldfunc); } else { GET_VM()->trap_list[sig].cmd = 0; } - -#if USE_TRAP_MASK - sigdelset(&mask, sig); - pthread_sigmask(SIG_SETMASK, &mask, NULL); -#endif + rb_enable_interrupt(); } #endif -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/