From 59b6d4a84fbe962284c6c6c55e5e3276db78652c Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 11 Nov 2008 11:00:29 +0000 Subject: merges r20144 from trunk into ruby_1_9_1. * include/ruby/io.h (rb_io_t): added write_lock to serialize. [ruby-core:19668] * gc.c (gc_mark_children): mark write_lock. * gc.c (rb_gc_call_finalizer_at_exit): Mutex also needs to be deferred. * io.c (io_fflush, io_binwrite, fptr_finalize): serializes writing. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/io.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/ruby/io.h') diff --git a/include/ruby/io.h b/include/ruby/io.h index d406b3226..04af3d07e 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -73,6 +73,7 @@ typedef struct rb_io_t { VALUE writeconv_pre_ecopts; int writeconv_initialized; + VALUE write_lock; } rb_io_t; #define HAVE_RB_IO_T 1 @@ -133,6 +134,7 @@ typedef struct rb_io_t { fp->encs.enc2 = NULL;\ fp->encs.ecflags = 0;\ fp->encs.ecopts = Qnil;\ + fp->write_lock = 0;\ } while (0) FILE *rb_io_stdio_file(rb_io_t *fptr); -- cgit