From a9f65bbd696c3fb61fcd4891ed79770a74f4e345 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 18 Sep 2009 05:32:13 +0000 Subject: * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45338018d5..dd26a38172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 18 14:30:40 2009 NAKAMURA Usaku + + * 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. + Thu Sep 17 14:33:37 2009 Nobuyoshi Nakada * eval.c (rb_thread_start_0, rb_thread_start_1): should call star diff --git a/win32/win32.c b/win32/win32.c index 4cd7a1917f..d163e78ee2 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2347,7 +2347,7 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, 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; @@ -2360,7 +2360,6 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, if (!subtract(&rest, &now)) break; if (compare(&rest, &wait) < 0) dowait = &rest; } - Sleep(dowait->tv_sec * 1000 + dowait->tv_usec / 1000); } } } -- cgit v1.2.3