From ae2370fb50bb66cbece2cf2f338b1569b631353f Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 23 Feb 2007 05:23:02 +0000 Subject: * signal.c (sighandler): need to tell to be interrupted to main context when handler is installed. * win32/win32.[ch] (rb_win32_interrupted): new function to listen interrupt. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ signal.c | 3 +++ win32/win32.c | 8 +++++++- win32/win32.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1c2f6dbb60..440a265bd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Feb 23 14:19:40 2007 NAKAMURA Usaku + + * signal.c (sighandler): need to tell to be interrupted to main + context when handler is installed. + + * win32/win32.[ch] (rb_win32_interrupted): new function to listen + interrupt. + Fri Feb 23 13:02:17 2007 Akinori MUSHA * numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize. diff --git a/signal.c b/signal.c index 9bc8a7d6c6..6c12ccbc28 100644 --- a/signal.c +++ b/signal.c @@ -493,6 +493,9 @@ sighandler(sig) else { ATOMIC_INC(rb_trap_pending); ATOMIC_INC(trap_pending_list[sig]); +#ifdef _WIN32 + rb_w32_interrupted(); +#endif } } diff --git a/win32/win32.c b/win32/win32.c index 30957cd211..19ee473281 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3323,6 +3323,12 @@ setup_call(CONTEXT* ctx, struct handler_arg_t *harg) #endif } +void +rb_w32_interrupted(void) +{ + SetSignal(interrupted_event); +} + int rb_w32_main_context(int arg, void (*handler)(int)) { @@ -3334,7 +3340,7 @@ rb_w32_main_context(int arg, void (*handler)(int)) if (GetCurrentThreadId() == main_thread.id) return FALSE; - SetSignal(interrupted_event); + rb_w32_interrupted(); RUBY_CRITICAL({ /* the main thread must be in user state */ CONTEXT ctx; diff --git a/win32/win32.h b/win32/win32.h index 48646da7a3..e74dbc7653 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -531,6 +531,7 @@ int rb_w32_times(struct tms *); /* thread stuff */ HANDLE GetCurrentThreadHandle(void); +void rb_w32_interrupted(void); int rb_w32_main_context(int arg, void (*handler)(int)); int rb_w32_sleep(unsigned long msec); void rb_w32_enter_critical(void); -- cgit v1.2.3