kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c (rb_w32_select): I hope performance problem was

Browse source 
solved.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-09-17 05:22:33 +00:00
parent aa21055faf
commit f0bcbbef67
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Sep 17 14:18:15 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_select): I hope performance problem was
solved.
Sat Sep 17 13:45:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_select): console support is back.

32
win32/win32.c
View file

@ -2025,6 +2025,21 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
return r;
}
static int
subst(struct timeval *rest, const struct timeval *wait)
{
while (rest->tv_usec < wait->tv_usec) {
if (rest->tv_sec <= wait->tv_sec) {
return 0;
}
rest->tv_sec -= 1;
rest->tv_usec += 1000 * 1000;
}
rest->tv_sec -= wait->tv_sec;
rest->tv_usec -= wait->tv_usec;
return 1;
}
long
rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
struct timeval *timeout)
@ -2083,8 +2098,11 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
RUBY_CRITICAL(
if (pipe_rd.fd_count || cons_rd.fd_count) {
long sec = timeout ? timeout->tv_sec + 1 : 0/*dummy*/;
while (!timeout || sec--) {
struct timeval rest;
struct timeval wait;
if (timeout) rest = *timeout;
wait.tv_sec = 0; wait.tv_usec = 10 * 1000; // 10ms
do {
fd_set buf; buf.fd_count = 0;
// pipe
extract_fd(&buf, &pipe_rd, is_readable_pipe);
@ -2092,21 +2110,19 @@ rb_w32_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
extract_fd(&buf, &cons_rd, is_readable_console);
// socket
if (buf.fd_count) {
struct timeval val; val.tv_sec = 0; val.tv_usec = 0;
r = do_select(nfds, rd, wr, ex, &val);
r = do_select(nfds, rd, wr, ex, &wait);
if (r >= 0) {
r += buf.fd_count;
extract_fd(rd, &buf, NULL); // move all `buf' contents into `rd'.
}
// XXX: should I ignore socket error and returns only readable pipe?
// XXX: should I ignore socket error and returns readable pipe/console?
break;
}
else {
struct timeval val; val.tv_sec = 1; val.tv_usec = 0;
r = do_select(nfds, rd, wr, ex, &val);
r = do_select(nfds, rd, wr, ex, &wait);
if (r) break; // readable or error (not pending)
}
}
} while (!timeout || subst(&rest, &wait));
}
else
r = do_select(nfds, rd, wr, ex, timeout);