Revert r32930 (Add more timing information in the VM to track time...)

runtime/vm/timer.h

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_TIMER_H_
 #define VM_TIMER_H_
 
 #include "vm/allocation.h"
 #include "vm/flags.h"
 #include "vm/os.h"
@@ skipping 65 matching lines @@
 };
 
 // List of per isolate timers.
 #define TIMER_LIST(V)                                                          \
   V(time_script_loading, "Script Loading")                                     \
   V(time_creating_snapshot, "Snapshot Creation")                               \
   V(time_isolate_initialization, "Isolate initialization")                     \
   V(time_compilation, "Function compilation")                                  \
   V(time_bootstrap, "Bootstrap of core classes")                               \
   V(time_dart_execution, "Dart execution")                                     \
-  V(time_native_execution, "Native code execution")                            \
   V(time_total_runtime, "Total runtime for isolate")                           \
 
 // Maintains a list of timers per isolate.
 class TimerList : public ValueObject {
  public:
   TimerList();
   ~TimerList() {}
 
   // Accessors.
 #define TIMER_FIELD_ACCESSOR(name, msg)                                        \
   Timer& name() { return name##_; }
   TIMER_LIST(TIMER_FIELD_ACCESSOR)
 #undef TIMER_FIELD_ACCESSOR
 
   void ReportTimers();
-  void ReportTimerState(const char* prefix);
 
   void PrintTimersToJSONProperty(JSONObject* jsobj);
 
  private:
 #define TIMER_FIELD(name, msg) Timer name##_;
   TIMER_LIST(TIMER_FIELD)
 #undef TIMER_FIELD
   bool padding_;
   DISALLOW_COPY_AND_ASSIGN(TimerList);
 };
 
 // Timer Usage.
-#define START_TIMER(isolate, name)                                             \
-  isolate->timer_list().name().Start();
+#define START_TIMER(name)                                                      \
+  Isolate::Current()->timer_list().name().Start();
 
-#define STOP_TIMER(isolate, name)                                              \
-  isolate->timer_list().name().Stop();
+#define STOP_TIMER(name)                                                       \
+  Isolate::Current()->timer_list().name().Stop();
 
-#define TIMER_STATE(isolate, prefix)                                           \
-  isolate->timer_list().ReportTimerState(prefix);
+// The class TimerScope is used to start and stop a timer within a scope.
+// It is used as follows:
+// {
+//   TIMERSCOPE(name_of_timer);
+//   ....
+//   .....
+//   code that needs to be timed.
+//   ....
+// }
+class TimerScope : public StackResource {
+ public:
+  TimerScope(bool flag, Timer* timer, BaseIsolate* isolate = NULL)
+      : StackResource(isolate), flag_(flag), nested_(false), timer_(timer) {
+    if (flag_) {
+      if (!timer_->running()) {
+        timer_->Start();
+      } else {
+        nested_ = true;
+      }
+    }
+  }
+  ~TimerScope() {
+    if (flag_) {
+      if (!nested_) {
+        timer_->Stop();
+      }
+    }
+  }
+
+ private:
+  bool flag_;
+  bool nested_;
+  Timer* timer_;
+  DISALLOW_COPY_AND_ASSIGN(TimerScope);
+};
+
+#define TIMERSCOPE(name)                                                       \
+  TimerScope vm_internal_timer_(true,                                          \
+                                &(Isolate::Current()->timer_list().name()))
 
 }  // namespace dart
 
 #endif  // VM_TIMER_H_