* 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
This commit is contained in:
parent
9bd33790b7
commit
e78d4e69fe
@ -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
|
||||
|
@ -283,6 +283,7 @@ VALUE rb_thread_shield_release(VALUE self);
|
||||
VALUE rb_thread_shield_destroy(VALUE self);
|
||||
void rb_mutex_allow_trap(VALUE self, int val);
|
||||
VALUE rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data);
|
||||
VALUE rb_mutex_owned_p(VALUE self);
|
||||
|
||||
/* thread_pthread.c, thread_win32.c */
|
||||
void Init_native_thread(void);
|
||||
|
5
io.c
5
io.c
@ -1006,7 +1006,10 @@ static inline int
|
||||
io_flush_buffer(rb_io_t *fptr)
|
||||
{
|
||||
if (fptr->write_lock) {
|
||||
return (int)rb_mutex_synchronize(fptr->write_lock, io_flush_buffer_async2, (VALUE)fptr);
|
||||
if (rb_mutex_owned_p(fptr->write_lock))
|
||||
return (int)io_flush_buffer_async2((VALUE)fptr);
|
||||
else
|
||||
return (int)rb_mutex_synchronize(fptr->write_lock, io_flush_buffer_async2, (VALUE)fptr);
|
||||
}
|
||||
else {
|
||||
return (int)io_flush_buffer_async((VALUE)fptr);
|
||||
|
Loading…
x
Reference in New Issue
Block a user