From 14869595501ceb1bb82c8b006cc2e9d0acdec908 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 9 Apr 2007 09:29:45 +0000 Subject: * thread.c (do_select): use ubf_select() as UBF on windows. * win32/win32.c (do_select): shouldn't call catch_interrupt() here. fixed: [ruby-dev:30674], reported by wanabe. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ thread.c | 2 +- version.h | 6 +++--- win32/win32.c | 7 ------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ccbc09a26..2bf05de0b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Apr 9 18:27:26 2007 NAKAMURA Usaku + + * thread.c (do_select): use ubf_select() as UBF on windows. + + * win32/win32.c (do_select): shouldn't call catch_interrupt() here. + fixed: [ruby-dev:30674], reported by wanabe. + Mon Apr 9 09:24:32 2007 Shugo Maeda * lib/net/imap.rb (disconnect): call shutdown for diff --git a/thread.c b/thread.c index 68fcf06294..c744b26926 100644 --- a/thread.c +++ b/thread.c @@ -1720,7 +1720,7 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except, if (except) *except = orig_except; wait = &wait_100ms; } while (__th->interrupt_flag == 0 && (timeout == 0 || subst(timeout, &wait_100ms))); - }, 0); + }, do_select); } while (result == 0 && (timeout == 0 || subst(timeout, &wait_100ms))); } #else diff --git a/version.h b/version.h index 647d474626..74d086dadb 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-04-08" +#define RUBY_RELEASE_DATE "2007-04-09" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070408 +#define RUBY_RELEASE_CODE 20070409 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; diff --git a/win32/win32.c b/win32/win32.c index 823ced33f1..3c8be568d9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2110,9 +2110,6 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, rb_w32_sleep(INFINITE); } else { -#if !USE_INTERRUPT_WINSOCK - int trap_immediate = rb_trap_immediate; -#endif /* !USE_INTERRUPT_WINSOCK */ RUBY_CRITICAL( r = select(nfds, rd, wr, ex, timeout); if (r == SOCKET_ERROR) { @@ -2120,10 +2117,6 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, r = -1; } ); -#if !USE_INTERRUPT_WINSOCK - rb_trap_immediate = trap_immediate; - catch_interrupt(); -#endif /* !USE_INTERRUPT_WINSOCK */ } return r; -- cgit v1.2.3