diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | thread.c | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Wed Nov 28 14:34:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * thread.c (rb_mutex_lock): moved trap context check from + rb_mutex_trylock because try_lock have no change to make + a deadlock. + * thread.c (rb_mutex_trylock): ditto. + * NEWS: news for the above. + Wed Nov 28 13:39:54 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread.c (thread_s_new): uses main_thread->status instead of @@ -4060,11 +4060,6 @@ rb_mutex_trylock(VALUE self) VALUE locked = Qfalse; GetMutexPtr(self, mutex); - /* When running trap handler */ - if (GET_THREAD()->interrupt_mask & TRAP_INTERRUPT_MASK) { - rb_raise(rb_eThreadError, "can't be called from trap context"); - } - native_mutex_lock(&mutex->lock); if (mutex->th == 0) { mutex->th = GET_THREAD(); @@ -4144,10 +4139,15 @@ static const rb_thread_t *patrol_thread = NULL; VALUE rb_mutex_lock(VALUE self) { + rb_thread_t *th = GET_THREAD(); + + /* When running trap handler */ + if (th->interrupt_mask & TRAP_INTERRUPT_MASK) { + rb_raise(rb_eThreadError, "can't be called from trap context"); + } if (rb_mutex_trylock(self) == Qfalse) { rb_mutex_t *mutex; - rb_thread_t *th = GET_THREAD(); GetMutexPtr(self, mutex); if (mutex->th == GET_THREAD()) { |