diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:00:29 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:00:29 +0000 |
| commit | 7d0e1c3a77ecc38d184daea5d81d973bf93bf0e2 (patch) | |
| tree | 61df6b51079a6a3b683fd5454d3e4c939b53114a /include | |
| parent | 5602a9dd3a004e63138c2b870a98947937c5b7be (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ruby/io.h b/include/ruby/io.h index d406b32264..04af3d07e3 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); |