1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (rb_thread_select): cleanup conditional compilation.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-05-16 05:53:14 +00:00
parent 849fb05bb1
commit 3b89da683f
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu May 16 14:46:34 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* eval.c (rb_thread_select): cleanup conditional compilation.
Tue May 14 18:17:44 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> Tue May 14 18:17:44 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* win32/Makefile.sub: config.h inlined. and catch up with the * win32/Makefile.sub: config.h inlined. and catch up with the

23
eval.c
View File

@ -8058,6 +8058,9 @@ rb_thread_select(max, read, write, except, timeout)
tv = *timeout; tv = *timeout;
tvp = &tv; tvp = &tv;
} }
#else
struct timeval *const tvp = timeout;
#endif
for (;;) { for (;;) {
TRAP_BEG; TRAP_BEG;
n = select(max, read, write, except, tvp); n = select(max, read, write, except, tvp);
@ -8068,6 +8071,7 @@ rb_thread_select(max, read, write, except, timeout)
#ifdef ERESTART #ifdef ERESTART
case ERESTART: case ERESTART:
#endif #endif
#ifndef linux
if (timeout) { if (timeout) {
double d = limit - timeofday(); double d = limit - timeofday();
@ -8076,6 +8080,7 @@ rb_thread_select(max, read, write, except, timeout)
if (tv.tv_sec < 0) tv.tv_sec = 0; if (tv.tv_sec < 0) tv.tv_sec = 0;
if (tv.tv_usec < 0) tv.tv_usec = 0; if (tv.tv_usec < 0) tv.tv_usec = 0;
} }
#endif
continue; continue;
default: default:
break; break;
@ -8083,24 +8088,6 @@ rb_thread_select(max, read, write, except, timeout)
} }
return n; return n;
} }
#else
for (;;) {
TRAP_BEG;
n = select(max, read, write, except, timeout);
TRAP_END;
if (n < 0) {
switch (errno) {
case EINTR:
#ifdef ERESTART
case ERESTART:
#endif
continue;
}
}
return n;
}
#endif
} }
curr_thread->status = THREAD_STOPPED; curr_thread->status = THREAD_STOPPED;