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 7

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

18
io.c
View file

@ -4263,7 +4263,7 @@ static void free_io_buffer(rb_io_buffer_t *buf);
static void clear_codeconv(rb_io_t *fptr); static void clear_codeconv(rb_io_t *fptr);
static void static void
fptr_finalize(rb_io_t *fptr, int noraise) fptr_finalize_flush(rb_io_t *fptr, int noraise)
{ {
VALUE err = Qnil; VALUE err = Qnil;
int fd = fptr->fd; int fd = fptr->fd;
@ -4323,6 +4323,12 @@ fptr_finalize(rb_io_t *fptr, int noraise)
rb_exc_raise(err); rb_exc_raise(err);
} }
} }
}
static void
fptr_finalize(rb_io_t *fptr, int noraise)
{
fptr_finalize_flush(fptr, noraise);
free_io_buffer(&fptr->rbuf); free_io_buffer(&fptr->rbuf);
free_io_buffer(&fptr->wbuf); free_io_buffer(&fptr->wbuf);
clear_codeconv(fptr); clear_codeconv(fptr);
@ -4402,6 +4408,7 @@ rb_io_memsize(const rb_io_t *fptr)
return size; return size;
} }
int rb_notify_fd_close(int fd);
VALUE VALUE
rb_io_close(VALUE io) rb_io_close(VALUE io)
{ {
@ -4409,6 +4416,7 @@ rb_io_close(VALUE io)
int fd; int fd;
VALUE write_io; VALUE write_io;
rb_io_t *write_fptr; rb_io_t *write_fptr;
int busy;
write_io = GetWriteIO(io); write_io = GetWriteIO(io);
if (io != write_io) { if (io != write_io) {
@ -4423,7 +4431,11 @@ rb_io_close(VALUE io)
if (fptr->fd < 0) return Qnil; if (fptr->fd < 0) return Qnil;
fd = fptr->fd; fd = fptr->fd;
rb_thread_fd_close(fd); busy = rb_notify_fd_close(fd);
fptr_finalize_flush(fptr, FALSE);
if (busy) {
do rb_thread_schedule(); while (rb_notify_fd_close(fd));
}
rb_io_fptr_cleanup(fptr, FALSE); rb_io_fptr_cleanup(fptr, FALSE);
if (fptr->pid) { if (fptr->pid) {
@ -6709,7 +6721,7 @@ io_reopen(VALUE io, VALUE nfile)
rb_update_max_fd(fd); rb_update_max_fd(fd);
fptr->fd = fd; fptr->fd = fd;
} }
rb_thread_fd_close(fd); rb_notify_fd_close(fd);
if ((orig->mode & FMODE_READABLE) && pos >= 0) { if ((orig->mode & FMODE_READABLE) && pos >= 0) {
if (io_seek(fptr, pos, SEEK_SET) < 0 && errno) { if (io_seek(fptr, pos, SEEK_SET) < 0 && errno) {
rb_sys_fail_path(fptr->pathv); rb_sys_fail_path(fptr->pathv);

21
test/ruby/test_io.rb
View file

@ -3207,4 +3207,25 @@ End
end end
end; end;
end end
def test_race_closed_stream
bug13158 = '[ruby-core:79262] [Bug #13158]'
closed = nil
IO.pipe do |r, w|
thread = Thread.new do
begin
while r.gets
end
ensure
closed = r.closed?
end
end
sleep 0.01
r.close
assert_raise_with_message(IOError, /stream closed/) do
thread.join
end
assert_equal(true, closed, "#{bug13158}: stream should be closed")
end
end
end end

10
thread.c
View file

@ -2123,14 +2123,13 @@ rb_threadptr_reset_raised(rb_thread_t *th)
return 1; return 1;
} }
void int
rb_thread_fd_close(int fd) rb_notify_fd_close(int fd)
{ {
rb_vm_t *vm = GET_THREAD()->vm; rb_vm_t *vm = GET_THREAD()->vm;
rb_thread_t *th = 0; rb_thread_t *th = 0;
int busy; int busy;
retry:
busy = 0; busy = 0;
list_for_each(&vm->living_threads, th, vmlt_node) { list_for_each(&vm->living_threads, th, vmlt_node) {
if (th->waiting_fd == fd) { if (th->waiting_fd == fd) {
@ -2140,10 +2139,7 @@ rb_thread_fd_close(int fd)
busy = 1; busy = 1;
} }
} }
if (busy) { return busy;
rb_thread_schedule_limits(0);
goto retry;
}
} }
/* /*

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26" #define RUBY_RELEASE_DATE "2017-03-26"
#define RUBY_PATCHLEVEL 426 #define RUBY_PATCHLEVEL 427
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3