summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--load.c3
-rw-r--r--thread.c3
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e226a12cb3..5987e07f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 24 17:59:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * load.c (load_lock): reverted.
+
+ * thread.c (rb_barrier_wait): check for recursive wait.
+
Mon Dec 24 17:50:54 2007 Tanaka Akira <akr@fsij.org>
* eval.c (function_call_may_return_twice_jmp_buf): removed.
diff --git a/load.c b/load.c
index bc80e0b154..a334fd6ee7 100644
--- a/load.c
+++ b/load.c
@@ -345,8 +345,7 @@ load_lock(const char *ftptr)
st_insert(loading_tbl, (st_data_t)ftptr, data);
return (char *)ftptr;
}
- rb_barrier_wait((VALUE)data);
- return 0;
+ return RTEST(rb_barrier_wait((VALUE)data)) ? (char *)ftptr : 0;
}
static void
diff --git a/thread.c b/thread.c
index 5fd2033f08..ae0c3b3bfb 100644
--- a/thread.c
+++ b/thread.c
@@ -2555,6 +2555,9 @@ rb_barrier_wait(VALUE self)
if (thlist_signal(&barrier->waiting, 1, &barrier->owner)) return Qfalse;
return Qtrue;
}
+ else if (barrier->owner == GET_THREAD()) {
+ return Qfalse;
+ }
else {
*barrier->tail = q = ALLOC(rb_thread_list_t);
q->th = GET_THREAD();