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

* io.c (io_fflush): flush write buffer without write lock in

Browse Source 
finalizers.  [ruby-dev:37572]

* io.c (rb_io_fptr_finalize): clear write lock before finalizing.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-12-25 06:55:38 +00:00
parent f20234994e
commit ad558a3a7f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Dec 25 15:54:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (io_fflush): flush write buffer without write lock in
finalizers. [ruby-dev:37572]
* io.c (rb_io_fptr_finalize): clear write lock before finalizing.
Thu Dec 25 15:07:22 2008 Tanaka Akira <akr@fsij.org>
* io.c (fptr_finalize): close the IO object even if close(2) is failed.

9
io.c
View File

@ -558,7 +558,13 @@ io_fflush(rb_io_t *fptr)
retry:
if (fptr->wbuf_len == 0)
return 0;
r = rb_mutex_synchronize(fptr->write_lock, io_flush_buffer, (VALUE)fptr);
if (fptr->write_lock) {
r = rb_mutex_synchronize(fptr->write_lock, io_flush_buffer, (VALUE)fptr);
}
else {
long l = io_writable_length(fptr, fptr->wbuf_len);
r = rb_write_internal(fptr->fd, fptr->wbuf+fptr->wbuf_off, l);
}
/* xxx: Other threads may modify wbuf.
* A lock is required, definitely. */
rb_io_check_closed(fptr);
@ -3190,6 +3196,7 @@ rb_io_fptr_finalize(rb_io_t *fptr)
{
if (!fptr) return 0;
fptr->pathv = Qnil;
fptr->write_lock = 0;
if (0 <= fptr->fd)
rb_io_fptr_cleanup(fptr, Qtrue);
if (fptr->rbuf) {