mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/win32.c (rb_w32_select): recalc the rest of timeout for each
iterations. [ruby-core:18015] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2c37e62b1b
commit
73816cc871
3 changed files with 46 additions and 9 deletions
|
@ -1,3 +1,8 @@
|
|||
Wed Jul 30 17:48:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* win32/win32.c (rb_w32_select): recalc the rest of timeout for each
|
||||
iterations. [ruby-core:18015]
|
||||
|
||||
Tue Jul 29 05:37:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* file.c (rb_find_file_ext, rb_find_file): explicit relative path
|
||||
|
|
10
test/ruby/test_sleep.rb
Normal file
10
test/ruby/test_sleep.rb
Normal file
|
@ -0,0 +1,10 @@
|
|||
require 'test/unit'
|
||||
|
||||
class TestSleep < Test::Unit::TestCase
|
||||
def test_sleep_5sec
|
||||
start = Time.now
|
||||
sleep 5
|
||||
slept = Time.now-start
|
||||
assert_in_delta(5.0, slept, 0.1, "[ruby-core:18015]: longer than expected")
|
||||
end
|
||||
end
|
|
@ -2177,7 +2177,7 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
|
|||
}
|
||||
|
||||
static inline int
|
||||
subst(struct timeval *rest, const struct timeval *wait)
|
||||
subtract(struct timeval *rest, const struct timeval *wait)
|
||||
{
|
||||
while (rest->tv_usec < wait->tv_usec) {
|
||||
if (rest->tv_sec <= wait->tv_sec) {
|
||||
|
@ -2207,8 +2207,8 @@ compare(const struct timeval *t1, const struct timeval *t2)
|
|||
|
||||
#undef Sleep
|
||||
long
|
||||
rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
|
||||
struct timeval *timeout)
|
||||
rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
|
||||
struct timeval *timeout)
|
||||
{
|
||||
long r;
|
||||
fd_set pipe_rd;
|
||||
|
@ -2216,11 +2216,29 @@ rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
|
|||
fd_set else_rd;
|
||||
fd_set else_wr;
|
||||
int nonsock = 0;
|
||||
struct timeval limit;
|
||||
|
||||
if (nfds < 0 || (timeout && (timeout->tv_sec < 0 || timeout->tv_usec < 0))) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (timeout) {
|
||||
if (timeout->tv_sec < 0 ||
|
||||
timeout->tv_usec < 0 ||
|
||||
timeout->tv_usec >= 1000000) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
gettimeofday(&limit, NULL);
|
||||
limit.tv_sec += timeout->tv_sec;
|
||||
limit.tv_usec += timeout->tv_usec;
|
||||
if (limit.tv_usec >= 1000000) {
|
||||
limit.tv_usec -= 1000000;
|
||||
limit.tv_sec++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!NtSocketsInitialized) {
|
||||
StartSockets();
|
||||
}
|
||||
|
@ -2253,10 +2271,9 @@ rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
|
|||
struct timeval rest;
|
||||
struct timeval wait;
|
||||
struct timeval zero;
|
||||
if (timeout) rest = *timeout;
|
||||
wait.tv_sec = 0; wait.tv_usec = 10 * 1000; // 10ms
|
||||
zero.tv_sec = 0; zero.tv_usec = 0; // 0ms
|
||||
do {
|
||||
for (;;) {
|
||||
if (nonsock) {
|
||||
// modifying {else,pipe,cons}_rd is safe because
|
||||
// if they are modified, function returns immediately.
|
||||
|
@ -2272,8 +2289,7 @@ rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
|
|||
break;
|
||||
}
|
||||
else {
|
||||
struct timeval *dowait =
|
||||
compare(&rest, &wait) < 0 ? &rest : &wait;
|
||||
struct timeval *dowait = &wait;
|
||||
|
||||
fd_set orig_rd;
|
||||
fd_set orig_wr;
|
||||
|
@ -2287,10 +2303,16 @@ rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
|
|||
if (wr) *wr = orig_wr;
|
||||
if (ex) *ex = orig_ex;
|
||||
|
||||
// XXX: should check the time select spent
|
||||
if (timeout) {
|
||||
struct timeval now;
|
||||
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);
|
||||
}
|
||||
} while (!timeout || subst(&rest, &wait));
|
||||
}
|
||||
}
|
||||
|
||||
return r;
|
||||
|
|
Loading…
Add table
Reference in a new issue