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

Side by Side Diff: src/log-inl.h

Issue 569028: Don't inline full VMState's constructor/destructor. (Closed)
Patch Set: Created 10 years, 10 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 | « src/log.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2009 the V8 project authors. All rights reserved. 1 // Copyright 2006-2009 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 15 matching lines...) Expand all
26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 27
28 #ifndef V8_LOG_INL_H_ 28 #ifndef V8_LOG_INL_H_
29 #define V8_LOG_INL_H_ 29 #define V8_LOG_INL_H_
30 30
31 #include "log.h" 31 #include "log.h"
32 32
33 namespace v8 { 33 namespace v8 {
34 namespace internal { 34 namespace internal {
35 35
36 //
37 // VMState class implementation. A simple stack of VM states held by the
38 // logger and partially threaded through the call stack. States are pushed by
39 // VMState construction and popped by destruction.
40 //
41 #ifdef ENABLE_LOGGING_AND_PROFILING 36 #ifdef ENABLE_LOGGING_AND_PROFILING
42 inline const char* StateToString(StateTag state) {
43 switch (state) {
44 case JS:
45 return "JS";
46 case GC:
47 return "GC";
48 case COMPILER:
49 return "COMPILER";
50 case OTHER:
51 return "OTHER";
52 default:
53 UNREACHABLE();
54 return NULL;
55 }
56 }
57 37
58 VMState::VMState(StateTag state) : disabled_(true), external_callback_(NULL) { 38 VMState::VMState(StateTag state) : disabled_(true), external_callback_(NULL) {
59 if (!Logger::is_logging()) { 39 if (!Logger::is_logging()) return;
60 return; 40 Initialize(state);
61 }
62
63 disabled_ = false;
64 #if !defined(ENABLE_HEAP_PROTECTION)
65 // When not protecting the heap, there is no difference between
66 // EXTERNAL and OTHER. As an optimization in that case, we will not
67 // perform EXTERNAL->OTHER transitions through the API. We thus
68 // compress the two states into one.
69 if (state == EXTERNAL) state = OTHER;
70 #endif
71 state_ = state;
72 previous_ = Logger::current_state_;
73 Logger::current_state_ = this;
74
75 if (FLAG_log_state_changes) {
76 LOG(UncheckedStringEvent("Entering", StateToString(state_)));
77 if (previous_ != NULL) {
78 LOG(UncheckedStringEvent("From", StateToString(previous_->state_)));
79 }
80 }
81
82 #ifdef ENABLE_HEAP_PROTECTION
83 if (FLAG_protect_heap && previous_ != NULL) {
84 if (state_ == EXTERNAL) {
85 // We are leaving V8.
86 ASSERT(previous_->state_ != EXTERNAL);
87 Heap::Protect();
88 } else if (previous_->state_ == EXTERNAL) {
89 // We are entering V8.
90 Heap::Unprotect();
91 }
92 }
93 #endif
94 } 41 }
95 42
96 43
97 VMState::~VMState() { 44 VMState::~VMState() {
98 if (disabled_) return; 45 if (disabled_) return;
99 Logger::current_state_ = previous_; 46 Destroy();
47 }
100 48
101 if (FLAG_log_state_changes) {
102 LOG(UncheckedStringEvent("Leaving", StateToString(state_)));
103 if (previous_ != NULL) {
104 LOG(UncheckedStringEvent("To", StateToString(previous_->state_)));
105 }
106 }
107
108 #ifdef ENABLE_HEAP_PROTECTION
109 if (FLAG_protect_heap && previous_ != NULL) {
110 if (state_ == EXTERNAL) {
111 // We are reentering V8.
112 ASSERT(previous_->state_ != EXTERNAL);
113 Heap::Unprotect();
114 } else if (previous_->state_ == EXTERNAL) {
115 // We are leaving V8.
116 Heap::Protect();
117 }
118 }
119 #endif 49 #endif
120 }
121 #endif
122
123 50
124 } } // namespace v8::internal 51 } } // namespace v8::internal
125 52
126 #endif // V8_LOG_INL_H_ 53 #endif // V8_LOG_INL_H_
OLDNEW
« no previous file with comments | « src/log.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698