Profiler Take 2

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"
 #include "vm/freelist.h"
 #include "vm/handles.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/object_id_ring.h"
 #include "vm/port.h"
 #include "vm/profiler.h"
 #include "vm/simulator.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
+#include "vm/thread_interrupter.h"
 #include "vm/thread_pool.h"
 #include "vm/virtual_memory.h"
 #include "vm/zone.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, heap_profile_initialize, false,
             "Writes a heap profile on isolate initialization.");
 DECLARE_FLAG(bool, print_class_table);
 DECLARE_FLAG(bool, trace_isolates);
@@ skipping 56 matching lines @@
   }
   Isolate::SetFileCallbacks(file_open, file_read, file_write, file_close);
   Isolate::SetEntropySourceCallback(entropy_source);
   OS::InitOnce();
   VirtualMemory::InitOnce();
   Isolate::InitOnce();
   PortMap::InitOnce();
   FreeListElement::InitOnce();
   Api::InitOnce();
   CodeObservers::InitOnce();
-  ProfilerManager::InitOnce();
+  Profiler::InitOnce();
+  ThreadInterrupter::InitOnce();
 #if defined(USING_SIMULATOR)
   Simulator::InitOnce();
 #endif
   // Create the read-only handles area.
   ASSERT(predefined_handles_ == NULL);
   predefined_handles_ = new ReadOnlyHandles();
   // Create the VM isolate and finish the VM initialization.
   ASSERT(thread_pool_ == NULL);
   thread_pool_ = new ThreadPool();
   {
@@ skipping 54 matching lines @@
   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();
 
   ShutdownIsolate();
   vm_isolate_ = NULL;
 #endif
 
-  ProfilerManager::Shutdown();
+  ThreadInterrupter::Shutdown();
+  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);
@@ skipping 84 matching lines @@
   return predefined_handles_->handles_.AllocateScopedHandle();
 }
 
 
 bool Dart::IsReadOnlyHandle(uword address) {
   ASSERT(predefined_handles_ != NULL);
   return predefined_handles_->handles_.IsValidScopedHandle(address);
 }
 
 }  // namespace dart