diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:12:11 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:12:11 +0000 |
commit | bd9588cdfc32d52e57d63d9dd3d188048839df60 (patch) | |
tree | dd5767814cd505cd48b0565ad8d7d0f2fa466b11 | |
parent | fffe09dd3dabd7dbcdbb1483bbed350563cd3b65 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm_core.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue May 17 20:20:49 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * 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@gmail.com> * cont.c (cont_init): clear macihne_stack_start/end of saved thread to @@ -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 @@ -427,7 +427,7 @@ typedef struct rb_thread_struct 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; |