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

* thread.c (rb_thread_wait_fd_rw): should not block by select if

Browse Source 
there's only one thread living.  fixed [ruby-dev:36646].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-10-08 23:49:22 +00:00
parent 43f77aaf1a
commit 22c8e88b41
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Oct 9 08:47:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (rb_thread_wait_fd_rw): should not block by select if
there's only one thread living. fixed [ruby-dev:36646].
Wed Oct 8 20:59:52 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> Wed Oct 8 20:59:52 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage * ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage

1
thread.c
View File

@ -2235,6 +2235,7 @@ rb_thread_wait_fd_rw(int fd, int read)
if (fd < 0) { if (fd < 0) {
rb_raise(rb_eIOError, "closed stream"); rb_raise(rb_eIOError, "closed stream");
} }
if (rb_thread_alone()) return;
while (result <= 0) { while (result <= 0) {
rb_fdset_t set; rb_fdset_t set;
rb_fd_init(&set); rb_fd_init(&set);