diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 18:07:19 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 18:07:19 +0000 |
commit | 2105a0652823c032d48d230b842832711ee5744b (patch) | |
tree | 6f621942a3a410b6508cedc24529f4bec2403e58 /thread.c | |
parent | 492d4ae58484df9dd314641cc44c56f7a3573303 (diff) |
merge revision(s) 57422: [Backport #13158]
io.c: close before wait
* io.c (io_close_fptr): notify then close, and wait for other
threads before free fptr. [ruby-core:79262] [Bug #13158]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -2159,14 +2159,13 @@ rb_threadptr_reset_raised(rb_thread_t *th) return 1; } -void -rb_thread_fd_close(int fd) +int +rb_notify_fd_close(int fd) { rb_vm_t *vm = GET_THREAD()->vm; rb_thread_t *th = 0; int busy; - retry: busy = 0; list_for_each(&vm->living_threads, th, vmlt_node) { if (th->waiting_fd == fd) { @@ -2176,10 +2175,7 @@ rb_thread_fd_close(int fd) busy = 1; } } - if (busy) { - rb_thread_schedule_limits(0); - goto retry; - } + return busy; } /* |