Profiler Take 2

runtime/vm/isolate.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/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "lib/mirrors.h"
@@ skipping 12 matching lines @@
 #include "vm/parser.h"
 #include "vm/port.h"
 #include "vm/profiler.h"
 #include "vm/reusable_handles.h"
 #include "vm/service.h"
 #include "vm/simulator.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 #include "vm/thread.h"
+#include "vm/thread_interrupter.h"
 #include "vm/timer.h"
 #include "vm/visitor.h"
 
 
 namespace dart {
 
 DEFINE_FLAG(bool, report_usage_count, false,
             "Track function usage and report.");
 DEFINE_FLAG(bool, trace_isolates, false,
             "Trace isolate creation and shut down.");
@@ skipping 289 matching lines @@
 #endif
   delete mutex_;
   mutex_ = NULL;  // Fail fast if interrupts are scheduled on a dead isolate.
   delete message_handler_;
   message_handler_ = NULL;  // Fail fast if we send messages to a dead isolate.
   ASSERT(deopt_context_ == NULL);  // No deopt in progress when isolate deleted.
   delete object_histogram_;
 }
 
 void Isolate::SetCurrent(Isolate* current) {
-  Isolate* old_isolate = Current();
-  if (old_isolate != NULL) {
-    ProfilerManager::DescheduleIsolate(old_isolate);
-  }
-  Thread::SetThreadLocal(isolate_key, reinterpret_cast<uword>(current));
-  if (current != NULL) {
-    ProfilerManager::ScheduleIsolate(current);
+  Isolate* old_current = Current();
+  if (old_current != current) {
+    Profiler::EndExecution(old_current);
+    Thread::SetThreadLocal(isolate_key, reinterpret_cast<uword>(current));
+    Profiler::BeginExecution(current);
   }
 }
 
 
 // The single thread local key which stores all the thread local data
 // for a thread. Since an Isolate is the central repository for
 // storing all isolate specific information a single thread local key
 // is sufficient.
 ThreadLocalKey Isolate::isolate_key = Thread::kUnsetThreadLocalKey;
 
 
 void Isolate::InitOnce() {
   ASSERT(isolate_key == Thread::kUnsetThreadLocalKey);
   isolate_key = Thread::CreateThreadLocal();
   ASSERT(isolate_key != Thread::kUnsetThreadLocalKey);
   create_callback_ = NULL;
 }
 
 
 Isolate* Isolate::Init(const char* name_prefix) {
   Isolate* result = new Isolate();
   ASSERT(result != NULL);
 
   // Setup for profiling.
-  ProfilerManager::SetupIsolateForProfiling(result);
+  Profiler::InitProfilingForIsolate(result);
 
   // TODO(5411455): For now just set the recently created isolate as
   // the current isolate.
   SetCurrent(result);
 
   // Setup the isolate specific resuable handles.
 #define REUSABLE_HANDLE_ALLOCATION(object)                                     \
   result->object##_handle_ = result->AllocateReusableHandle<object>();         \
 
   REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_ALLOCATION)
@@ skipping 333 matching lines @@
     // Fail fast if anybody tries to post any more messsages to this isolate.
     delete message_handler();
     set_message_handler(NULL);
 
     // Dump all accumalated timer data for the isolate.
     timer_list_.ReportTimers();
     if (FLAG_report_usage_count) {
       PrintInvokedFunctions();
     }
 
+    // Profiler::WriteTracing(this);
+
     // Write out the coverage data if collection has been enabled.
     CodeCoverage::Write(this);
 
     // Finalize any weak persistent handles with a non-null referent.
     FinalizeWeakPersistentHandlesVisitor visitor;
     api_state()->weak_persistent_handles().VisitHandles(&visitor);
 
     CompilerStats::Print();
     if (FLAG_trace_isolates) {
       heap()->PrintSizes();
       megamorphic_cache_table()->PrintSizes();
       Symbols::DumpStats();
       OS::Print("[-] Stopping isolate:\n"
                 "\tisolate:    %s\n", name());
     }
   }
 
   // TODO(5411455): For now just make sure there are no current isolates
   // as we are shutting down the isolate.
   SetCurrent(NULL);
-  ProfilerManager::DescheduleIsolate(this);
-  ProfilerManager::ShutdownIsolateForProfiling(this);
+  Profiler::ShutdownProfilingForIsolate(this);
 }
 
 
 Dart_IsolateCreateCallback Isolate::create_callback_ = NULL;
 Dart_IsolateInterruptCallback Isolate::interrupt_callback_ = NULL;
 Dart_IsolateUnhandledExceptionCallback
     Isolate::unhandled_exception_callback_ = NULL;
 Dart_IsolateShutdownCallback Isolate::shutdown_callback_ = NULL;
 Dart_FileOpenCallback Isolate::file_open_callback_ = NULL;
 Dart_FileReadCallback Isolate::file_read_callback_ = NULL;
@@ skipping 361 matching lines @@
   return func.raw();
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(isolate());
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart