archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

merge revision(s) 57422: [Backport #13158]

Browse source 
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_2@58094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-03-25 16:03:27 +00:00
parent 8a14ed3df5
commit a48d15477e
4 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
thread.c
View file

@ -2123,14 +2123,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) {
@ -2140,10 +2139,7 @@ rb_thread_fd_close(int fd)
busy = 1;
}
}
if (busy) {
rb_thread_schedule_limits(0);
goto retry;
}
return busy;
}
/*