From ada9870af9da1443fe7be51ee50c98cdbfb53c45 Mon Sep 17 00:00:00 2001 From: kosaki Date: Fri, 29 Apr 2011 15:20:00 +0000 Subject: [PATCH] * thread_pthread.c (gvl_init): fix hangup if GVL_SIMPLE_LOCK=1. We don't have to call mutex_unlock() before initialize it! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread_pthread.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f9b82342c5..688e77c209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Apr 30 00:16:40 2011 KOSAKI Motohiro + + * thread_pthread.c (gvl_init): fix hangup if GVL_SIMPLE_LOCK=1. + We don't have to call mutex_unlock() before initialize it! + Fri Apr 29 13:15:15 2011 KOSAKI Motohiro * thread_win32.c (native_cond_timedwait): New. r31373 caused diff --git a/thread_pthread.c b/thread_pthread.c index f60da8ab7e..4161f663db 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -128,7 +128,7 @@ gvl_init(rb_vm_t *vm) if (GVL_DEBUG) fprintf(stderr, "gvl init\n"); #if GVL_SIMPLE_LOCK - native_mutex_reinitialize_atfork(&vm->gvl.lock); + native_mutex_initialize(&vm->gvl.lock); #else native_mutex_initialize(&vm->gvl.lock); vm->gvl.waiting_threads = 0;