shyouhei	2009-02-10 20:01:59 +0900 (Tue, 10 Feb 2009)

  New Revision: 22205

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22205

  Log:
    merge revision(s) 20225:
    * eval.c (load_lock): makes circular require deadlock.
      [ruby-core:19821]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/eval.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22204)
+++ ruby_1_8_7/ChangeLog	(revision 22205)
@@ -1,3 +1,8 @@
+Tue Feb 10 20:00:52 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (load_lock): makes circular require deadlock.
+	  [ruby-core:19821]
+
 Tue Feb 10 19:40:58 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_feature_p): returns found feature name if loading.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22204)
+++ ruby_1_8_7/version.h	(revision 22205)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-10"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090210
-#define RUBY_PATCHLEVEL 112
+#define RUBY_PATCHLEVEL 113
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 22204)
+++ ruby_1_8_7/eval.c	(revision 22205)
@@ -1440,6 +1440,8 @@
 
 int ruby_in_eval;
 
+static int rb_thread_join _((rb_thread_t, double));
+
 static void rb_thread_cleanup _((void));
 static void rb_thread_wait_other_threads _((void));
 
@@ -7241,8 +7243,9 @@
 	return (char *)ftptr;
     }
     do {
-	if ((rb_thread_t)th == curr_thread) return 0;
-	CHECK_INTS;
+	rb_thread_t owner = (rb_thread_t)th;
+	if (owner == curr_thread) return 0;
+	rb_thread_join(owner->thread, -1.0);
     } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
     return 0;
 }
@@ -11386,8 +11389,6 @@
     return curr_thread->select_value;
 }
 
-static int rb_thread_join _((rb_thread_t, double));
-
 static int
 rb_thread_join(th, limit)
     rb_thread_t th;

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