[前][次][番号順一覧][スレッド一覧]

ruby-changes:19790

From: yugui <ko1@a...>
Date: Tue, 31 May 2011 09:12:23 +0900 (JST)
Subject: [ruby-changes:19790] yugui:r31835 (ruby_1_9_2): merges r31609 from trunk into ruby_1_9_2.

yugui	2011-05-31 09:12:11 +0900 (Tue, 31 May 2011)

  New Revision: 31835

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

  Log:
    merges r31609 from trunk into ruby_1_9_2.
    --
    * vm_core.h (rb_thread_struct): add volatile to
      transition_for_lock because it is not protected by lock.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/vm_core.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31834)
+++ ruby_1_9_2/ChangeLog	(revision 31835)
@@ -1,3 +1,8 @@
+Tue May 17 20:20:49 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* vm_core.h (rb_thread_struct): add volatile to
+	  transition_for_lock because it is not protected by lock.
+
 Sun May 15 21:22:35 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* cont.c (cont_init): clear macihne_stack_start/end of saved thread to
Index: ruby_1_9_2/vm_core.h
===================================================================
--- ruby_1_9_2/vm_core.h	(revision 31834)
+++ ruby_1_9_2/vm_core.h	(revision 31835)
@@ -427,7 +427,7 @@
     struct rb_unblock_callback unblock;
     VALUE locking_mutex;
     struct rb_mutex_struct *keeping_mutexes;
-    int transition_for_lock;
+    volatile int transition_for_lock;
 
     struct rb_vm_tag *tag;
     struct rb_vm_protect_tag *protect_tag;
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31834)
+++ ruby_1_9_2/version.h	(revision 31835)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 252
+#define RUBY_PATCHLEVEL 253
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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

[前][次][番号順一覧][スレッド一覧]