summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-30 12:09:10 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-30 12:09:10 +0000
commit4757e396d2f8d8f39807cee32ef569e70dea9b15 (patch)
tree7a44c3733fef2b6896b9b7732ec5957b3d21b4f2 /thread.c
parent188ae0dbb13022332db52f65f2c5c6a8e54d77e1 (diff)
merge revision(s) 59030,59031: [Backport #13638]
thread.c: avoid busy looping on rb_thread_fd_close We no longer use it this function, but extensions do, and we need to ensure it continues to work for them. * thread.c (rb_thread_fd_close): schedule other threads in loop * ext/-test-/thread_fd_close/thread_fd_close.c: new file * ext/-test-/thread_fd_close/depend: ditto * ext/-test-/thread_fd_close/extconf.rb: ditto * test/-ext-/thread_fd_close/test_thread_fd_close.rb: new test * properties. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index e86ebee1f0..7e504a0865 100644
--- a/thread.c
+++ b/thread.c
@@ -2190,7 +2190,7 @@ rb_notify_fd_close(int fd)
void
rb_thread_fd_close(int fd)
{
- while (rb_notify_fd_close(fd));
+ while (rb_notify_fd_close(fd)) rb_thread_schedule();
}
/*