Clean up VMState a little bit.

src/vm-state-inl.h

Index: src/vm-state-inl.h
diff --git a/src/vm-state-inl.h b/src/vm-state-inl.h
index fae68ebeea4e8f13613b79da88f8b4fa3d77ab18..3bbf5152ed8d3abe7c92b3971a9ed3b64055971f 100644
--- a/src/vm-state-inl.h
+++ b/src/vm-state-inl.h
@@ -47,8 +47,6 @@ inline const char* StateToString(StateTag state) {
       return "GC";
     case COMPILER:
       return "COMPILER";
-    case PARALLEL_COMPILER:
-      return "PARALLEL_COMPILER";
     case OTHER:
       return "OTHER";
     case EXTERNAL:
@@ -60,36 +58,26 @@ inline const char* StateToString(StateTag state) {
 }
 
 
-VMState::VMState(Isolate* isolate, StateTag tag)
+template <StateTag Tag>
+VMState<Tag>::VMState(Isolate* isolate)
     : isolate_(isolate), previous_tag_(isolate->current_vm_state()) {
-  if (FLAG_log_state_changes) {
-    LOG(isolate, UncheckedStringEvent("Entering", StateToString(tag)));
-    LOG(isolate, UncheckedStringEvent("From", StateToString(previous_tag_)));
-  }
-
-  if (FLAG_log_timer_events && previous_tag_ != EXTERNAL && tag == EXTERNAL) {
-    LOG(isolate_, EnterExternal());
+  if (FLAG_log_timer_events && previous_tag_ != EXTERNAL && Tag == EXTERNAL) {

[Sven Panne, 2013/04/24 14:03:41]

Do we really don't want to call set_current_vm_state for EXTERNAL? If yes,
template specialization (for EXTERNAL) makes things a bit clearer here.

+    LOG(isolate_,
+        TimerEvent(Logger::START, Logger::TimerEventScope::v8_external));
+  } else {
+    isolate_->set_current_vm_state(Tag);
   }
-
-  isolate_->SetCurrentVMState(tag);
 }
 
 
-VMState::~VMState() {
-  if (FLAG_log_state_changes) {
+template <StateTag Tag>
+VMState<Tag>::~VMState() {
+  if (FLAG_log_timer_events && previous_tag_ != EXTERNAL && Tag == EXTERNAL) {
     LOG(isolate_,
-        UncheckedStringEvent("Leaving",
-                              StateToString(isolate_->current_vm_state())));
-    LOG(isolate_,
-        UncheckedStringEvent("To", StateToString(previous_tag_)));
-  }
-
-  if (FLAG_log_timer_events &&
-      previous_tag_ != EXTERNAL && isolate_->current_vm_state() == EXTERNAL) {
-    LOG(isolate_, LeaveExternal());
+        TimerEvent(Logger::END, Logger::TimerEventScope::v8_external));
+  } else {
+    isolate_->set_current_vm_state(previous_tag_);
   }
-
-  isolate_->SetCurrentVMState(previous_tag_);
 }