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 /ChangeLog | |
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 'ChangeLog')
-rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Sat Dec 15 13:57:08 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * 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. + Sat Dec 15 13:38:30 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * io.c (io_flush_buffer): uses io_flush_buffer_async2 instead of |