nobu	2007-12-24 17:59:31 +0900 (Mon, 24 Dec 2007)

  New Revision: 14593

  Modified files:
    trunk/ChangeLog
    trunk/load.c
    trunk/thread.c

  Log:
    * load.c (load_lock): reverted.
    
    * thread.c (rb_barrier_wait): check for recursive wait.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/load.c?r1=14593&r2=14592
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14593&r2=14592
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/thread.c?r1=14593&r2=14592

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14592)
+++ ChangeLog	(revision 14593)
@@ -1,3 +1,9 @@
+Mon Dec 24 17:59:29 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* load.c (load_lock): reverted.
+
+	* thread.c (rb_barrier_wait): check for recursive wait.
+
 Mon Dec 24 17:50:54 2007  Tanaka Akira  <akr@f...>
 
 	* eval.c (function_call_may_return_twice_jmp_buf): removed.
Index: load.c
===================================================================
--- load.c	(revision 14592)
+++ load.c	(revision 14593)
@@ -345,8 +345,7 @@
 	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
Index: thread.c
===================================================================
--- thread.c	(revision 14592)
+++ thread.c	(revision 14593)
@@ -2555,6 +2555,9 @@
 	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();

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml