summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--thread_pthread.c7
2 files changed, 4 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f79f0df7a6..fb72bc0d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 18 21:36:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread_pthread.c: remove GVL_DEBUG
+
Sat Jun 18 21:32:02 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* vm.c, vm_core.h (rb_vm_stack_to_heap): remove const.
diff --git a/thread_pthread.c b/thread_pthread.c
index d8e4d11ee8..ba202f48e0 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -40,12 +40,9 @@ static void native_cond_destroy(rb_thread_cond_t *cond);
#define USE_MONOTONIC_COND 0
#endif
-#define GVL_DEBUG 0
-
static void
__gvl_acquire(rb_vm_t *vm)
{
-
if (vm->gvl.acquired) {
vm->gvl.waiting++;
while (vm->gvl.acquired) {
@@ -127,8 +124,6 @@ gvl_yield(rb_vm_t *vm, rb_thread_t *th)
static void
gvl_init(rb_vm_t *vm)
{
- if (GVL_DEBUG) fprintf(stderr, "gvl init\n");
-
native_mutex_initialize(&vm->gvl.lock);
native_cond_initialize(&vm->gvl.cond, RB_CONDATTR_CLOCK_MONOTONIC);
native_cond_initialize(&vm->gvl.switch_cond, RB_CONDATTR_CLOCK_MONOTONIC);
@@ -141,14 +136,12 @@ gvl_init(rb_vm_t *vm)
static void
gvl_destroy(rb_vm_t *vm)
{
- if (GVL_DEBUG) fprintf(stderr, "gvl destroy\n");
native_mutex_destroy(&vm->gvl.lock);
}
static void
gvl_atfork(rb_vm_t *vm)
{
- if (GVL_DEBUG) fprintf(stderr, "gvl atfork\n");
gvl_init(vm);
gvl_acquire(vm, GET_THREAD());
}