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

runtime/vm/dart.cc

 // Copyright (c) 2013, 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.
 
 #include "vm/dart.h"
 
 #include "vm/code_observers.h"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
@@ skipping 120 matching lines @@
     }
 #endif
     PremarkingVisitor premarker(vm_isolate_);
     vm_isolate_->heap()->WriteProtect(false);
     vm_isolate_->heap()->IterateOldObjects(&premarker);
     vm_isolate_->heap()->WriteProtect(true);
   }
   // There is a planned and known asymmetry here: We enter one scope for the VM
   // isolate so that we can allocate the "persistent" scoped handles for the
   // predefined API values (such as Dart_True, Dart_False and Dart_Null).
-  START_TIMER(vm_isolate_, time_native_execution);
   Dart_EnterScope();
   Api::InitHandles();
 
   Isolate::SetCurrent(NULL);  // Unregister the VM isolate from this thread.
   Isolate::SetCreateCallback(create);
   Isolate::SetServiceCreateCallback(service_create);
   Isolate::SetInterruptCallback(interrupt);
   Isolate::SetUnhandledExceptionCallback(unhandled);
   Isolate::SetShutdownCallback(shutdown);
   return NULL;
@@ skipping 13 matching lines @@
 
   delete thread_pool_;
   thread_pool_ = NULL;
 
   // Set the VM isolate as current isolate.
   Isolate::SetCurrent(vm_isolate_);
 
   // There is a planned and known asymmetry here: We exit one scope for the VM
   // isolate to account for the scope that was entered in Dart_InitOnce.
   Dart_ExitScope();
-  STOP_TIMER(vm_isolate_, time_native_execution);
 
   ShutdownIsolate();
   vm_isolate_ = NULL;
 #endif
 
   Profiler::Shutdown();
   CodeObservers::DeleteAll();
 
   return NULL;
 }
 
 
 Isolate* Dart::CreateIsolate(const char* name_prefix) {
   // Create a new isolate.
   Isolate* isolate = Isolate::Init(name_prefix);
   ASSERT(isolate != NULL);
   return isolate;
 }
 
 
 RawError* Dart::InitializeIsolate(const uint8_t* snapshot_buffer, void* data) {
   // Initialize the new isolate.
+  TIMERSCOPE(time_isolate_initialization);
   Isolate* isolate = Isolate::Current();
-  TIMERSCOPE(isolate, time_isolate_initialization);
   ASSERT(isolate != NULL);
   StackZone zone(isolate);
   HandleScope handle_scope(isolate);
   Heap::Init(isolate);
   ObjectIdRing::Init(isolate);
   ObjectStore::Init(isolate);
 
   if (snapshot_buffer == NULL) {
     const Error& error = Error::Handle(Object::Init(isolate));
     if (!error.IsNull()) {
@@ skipping 64 matching lines @@
   return predefined_handles_->handles_.AllocateScopedHandle();
 }
 
 
 bool Dart::IsReadOnlyHandle(uword address) {
   ASSERT(predefined_handles_ != NULL);
   return predefined_handles_->handles_.IsValidScopedHandle(address);
 }
 
 }  // namespace dart