diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rwxr-xr-x | instruby.rb | 2 | ||||
| -rw-r--r-- | version.h | 8 | ||||
| -rw-r--r-- | win32/win32.c | 12 |
4 files changed, 34 insertions, 11 deletions
@@ -1,3 +1,26 @@ +Wed Nov 18 14:13:14 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * instruby.rb: win32/win32.h exists in srcdir. + reported by arton ( http://www.artonx.org/diary/20090919.html#p01 ) + +Wed Nov 18 14:13:14 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (subtract): if the parameters are same value, should + return zero. + +Wed Nov 18 14:13:14 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_select): of course, need to initialize rest. + +Wed Nov 18 14:13:14 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_select): wait specified time on select. + +Wed Nov 18 14:13:14 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_select): on 1.8, we don't need to poll sockets, + because our select is never called from multiple threads. + Tue Nov 17 16:22:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_thread_start_0, rb_thread_start_1): should call star diff --git a/instruby.rb b/instruby.rb index 2903a7c739..305ad905e4 100755 --- a/instruby.rb +++ b/instruby.rb @@ -359,7 +359,7 @@ install?(:local, :arch, :lib) do if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/ win32libdir = File.join(archlibdir, "win32") makedirs win32libdir - install "win32/win32.h", win32libdir, :mode => $data_mode + install File.join(srcdir, "win32", "win32.h"), win32libdir, :mode => $data_mode end end @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-11-17" +#define RUBY_RELEASE_DATE "2009-11-18" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20091117 -#define RUBY_PATCHLEVEL 210 +#define RUBY_RELEASE_CODE 20091118 +#define RUBY_PATCHLEVEL 211 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 18 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/win32.c b/win32/win32.c index b5cd90dbb7..c9081327f5 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2211,7 +2211,7 @@ subtract(struct timeval *rest, const struct timeval *wait) if (rest->tv_sec < wait->tv_sec) { return 0; } - while (rest->tv_usec < wait->tv_usec) { + while (rest->tv_usec <= wait->tv_usec) { if (rest->tv_sec <= wait->tv_sec) { return 0; } @@ -2305,6 +2305,7 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, struct timeval zero; wait.tv_sec = 0; wait.tv_usec = 10 * 1000; // 10ms zero.tv_sec = 0; zero.tv_usec = 0; // 0ms + if (timeout) rest = *timeout; for (;;) { if (nonsock) { // modifying {else,pipe,cons}_rd is safe because @@ -2321,15 +2322,16 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, break; } else { - struct timeval *dowait = &wait; - fd_set orig_rd; fd_set orig_wr; fd_set orig_ex; + struct timeval *dowait = &wait; + if (timeout && compare(&rest, &wait) < 0) dowait = &rest; + if (rd) orig_rd = *rd; if (wr) orig_wr = *wr; if (ex) orig_ex = *ex; - r = do_select(nfds, rd, wr, ex, &zero); // polling + r = do_select(nfds, rd, wr, ex, dowait); if (r != 0) break; // signaled or error if (rd) *rd = orig_rd; if (wr) *wr = orig_wr; @@ -2340,9 +2342,7 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, gettimeofday(&now, NULL); rest = limit; if (!subtract(&rest, &now)) break; - if (compare(&rest, &wait) < 0) dowait = &rest; } - Sleep(dowait->tv_sec * 1000 + dowait->tv_usec / 1000); } } } |