Add isolate tag-profile and better handling of errors

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 320 matching lines @@
       stacktrace_(NULL),
       stack_frame_index_(-1),
       cha_used_(false),
       object_id_ring_(NULL),
       profiler_data_(NULL),
       thread_state_(NULL),
       next_(NULL),
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
       reusable_handles_() {
-  set_vm_tag(VMTag::kVMTagId);
+  set_vm_tag(VMTag::kIdleTagId);
 }
 #undef REUSABLE_HANDLE_SCOPE_INIT
 #undef REUSABLE_HANDLE_INITIALIZERS
 
 
 Isolate::~Isolate() {
   delete [] name_;
   delete heap_;
   delete object_store_;
   delete api_state_;
   delete stub_code_;
   delete debugger_;
 #if defined(USING_SIMULATOR)
   delete simulator_;
 #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 spawn_state_;
 }
 
 
 void Isolate::SetCurrent(Isolate* current) {
   Isolate* old_current = Current();
   if (old_current != NULL) {
+    old_current->set_vm_tag(VMTag::kIdleTagId);
     old_current->set_thread_state(NULL);
     Profiler::EndExecution(old_current);
   }
   Thread::SetThreadLocal(isolate_key, reinterpret_cast<uword>(current));
   if (current != NULL) {
     ASSERT(current->thread_state() == NULL);
     InterruptableThreadState* thread_state =
         ThreadInterrupter::GetCurrentThreadState();
 #if defined(DEBUG)
     CheckForDuplicateThreadState(thread_state);
 #endif
     Profiler::BeginExecution(current);
     current->set_thread_state(thread_state);
+    current->set_vm_tag(VMTag::kVMTagId);
   }
 }
 
 
 // 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;
 
@@ skipping 524 matching lines @@
   jsobj.AddProperty("controlPorts", control_ports);
   jsobj.AddProperty("pausedOnStart", pause_on_start);
   jsobj.AddProperty("pausedOnExit", paused_on_exit);
   jsobj.AddProperty("pauseOnExit", pause_on_exit);
   const Library& lib =
       Library::Handle(object_store()->root_library());
   jsobj.AddProperty("rootLib", lib);
 
   timer_list().PrintTimersToJSONProperty(&jsobj);
 
+  if (object_store()->sticky_error() != Object::null()) {
+    Error& error = Error::Handle(this, object_store()->sticky_error());
+    ASSERT(!error.IsNull());
+    jsobj.AddProperty("error", error, false);
+  }
+
   {
     JSONObject typeargsRef(&jsobj, "canonicalTypeArguments");
     typeargsRef.AddProperty("type", "@TypeArgumentsList");
     typeargsRef.AddProperty("id", "typearguments");
     typeargsRef.AddProperty("name", "canonical type arguments");
   }
 }
 
 
+void Isolate::ProfileInterrupt() {
+  InterruptableThreadState* state = thread_state();
+  if (state == NULL) {
+    // Isolate is not scheduled on a thread.
+    ProfileIdle();
+    return;
+  }
+  ASSERT(state->id != Thread::kInvalidThreadId);
+  ThreadInterrupter::InterruptThread(state);
+}
+
+
+void Isolate::ProfileIdle() {
+  vm_tag_counters_.Increment(vm_tag());
+}
+
+
 void Isolate::VisitIsolates(IsolateVisitor* visitor) {
   if (visitor == NULL) {
     return;
   }
   MonitorLocker ml(isolates_list_monitor_);
   Isolate* current = isolates_list_head_;
   while (current) {
     visitor->VisitIsolate(current);
     current = current->next_;
   }
@@ skipping 149 matching lines @@
   return func.raw();
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(isolate());
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart