glass	2013-01-09 22:14:05 +0900 (Wed, 09 Jan 2013)

  New Revision: 38749

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

  Log:
    * load.c (load_lock): revert r38744. it should acquire new thread
      shield.

  Modified files:
    trunk/ChangeLog
    trunk/load.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38748)
+++ ChangeLog	(revision 38749)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jan  9 21:43:32 2013  Masaki Matsushita  <glass.saga@g...>
+
+	* load.c (load_lock): revert r38744. it should acquire new thread
+	  shield.
+
 Wed Jan  9 15:40:18 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm.c (th_init, ruby_thread_init): initialize root_svar with Qnil,
Index: load.c
===================================================================
--- load.c	(revision 38748)
+++ load.c	(revision 38749)
@@ -668,6 +668,9 @@ load_lock(const char *ftptr) https://github.com/ruby/ruby/blob/trunk/load.c#L668
     }
     switch (rb_thread_shield_wait((VALUE)data)) {
       case Qfalse:
+	data = (st_data_t)ftptr;
+	st_delete(loading_tbl, &data, 0);
+	return 0;
       case Qnil:
 	return 0;
     }

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