Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Side by Side Diff: src/vm-state.h

Issue 2852047: Fix concurrent access to VMState::current_state_. (Closed)
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/vm-state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 26 matching lines...) Expand all
37 inline VMState(StateTag state); 37 inline VMState(StateTag state);
38 inline ~VMState(); 38 inline ~VMState();
39 39
40 StateTag state() { return state_; } 40 StateTag state() { return state_; }
41 void set_external_callback(Address external_callback) { 41 void set_external_callback(Address external_callback) {
42 external_callback_ = external_callback; 42 external_callback_ = external_callback;
43 } 43 }
44 44
45 // Used for debug asserts. 45 // Used for debug asserts.
46 static bool is_outermost_external() { 46 static bool is_outermost_external() {
47 return current_state_ == NULL; 47 return current_state_ == 0;
48 } 48 }
49 49
50 static StateTag current_state() { 50 static StateTag current_state() {
51 return current_state_ ? current_state_->state() : EXTERNAL; 51 VMState* state = reinterpret_cast<VMState*>(current_state_);
52 return state ? state->state() : EXTERNAL;
52 } 53 }
53 54
54 static Address external_callback() { 55 static Address external_callback() {
55 return current_state_ ? current_state_->external_callback_ : NULL; 56 VMState* state = reinterpret_cast<VMState*>(current_state_);
57 return state ? state->external_callback_ : NULL;
56 } 58 }
57 59
58 private: 60 private:
59 bool disabled_; 61 bool disabled_;
60 StateTag state_; 62 StateTag state_;
61 VMState* previous_; 63 VMState* previous_;
62 Address external_callback_; 64 Address external_callback_;
63 65
64 // A stack of VM states. 66 // A stack of VM states.
65 static VMState* current_state_; 67 static AtomicWord current_state_;
66 #else 68 #else
67 public: 69 public:
68 explicit VMState(StateTag state) {} 70 explicit VMState(StateTag state) {}
69 #endif 71 #endif
70 }; 72 };
71 73
72 } } // namespace v8::internal 74 } } // namespace v8::internal
73 75
74 76
75 #endif // V8_VM_STATE_H_ 77 #endif // V8_VM_STATE_H_
OLDNEW
« no previous file with comments | « no previous file | src/vm-state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698