diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-15 05:40:18 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-15 05:40:18 +0000 |
commit | e78d4e69fe15b84358ce8fb30edf5c6610a6bad9 (patch) | |
tree | 5830fe451bd74508e6f77b29b0e18b6c2a8e56df /thread.c | |
parent | 9bd33790b7f992520f003954df743dd6e8502622 (diff) | |
download | ruby-e78d4e69fe15b84358ce8fb30edf5c6610a6bad9.tar.gz |
* thread.c (rb_mutex_owned_p): remove static.
* io.c (io_flush_buffer): don't hold mutex if already have.
Now recursive lock may occur when following scenario.
fptr_finalize -> finish_writeconv_sync -> finish_writeconv
-> io_fflush.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4264,7 +4264,7 @@ rb_mutex_lock(VALUE self) * Returns +true+ if this lock is currently held by current thread. * <em>This API is experimental, and subject to change.</em> */ -static VALUE +VALUE rb_mutex_owned_p(VALUE self) { VALUE owned = Qfalse; |