summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-17 11:22:50 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-17 11:22:50 +0000
commit30414014042210a895b5df3c3eaa86981e0b2e2f (patch)
treec823e867b186aaf4661a37c0e367c6c9101e7d16
parent083ec6049e9f484486613d571a7b467d97652576 (diff)
* 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/trunk@31609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_core.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index db7e5e77d0..fba82c0db8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
Tue May 17 20:08:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* LEGAL (missing/{elf,tgamma,lgamma_r}.c): they've been replaced by
diff --git a/vm_core.h b/vm_core.h
index c5417d9381..e302e62a4b 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -435,7 +435,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;