Added task kind field to thread JSON output.

runtime/vm/thread.cc

 // Copyright (c) 2015, 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/thread.h"
 
 #include "vm/compiler_stats.h"
 #include "vm/dart_api_state.h"
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
@@ skipping 195 matching lines @@
 }
 
 
 #ifndef PRODUCT
 // Collect information about each individual zone associated with this thread.
 void Thread::PrintJSON(JSONStream* stream) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "_Thread");
   jsobj.AddPropertyF("id", "threads/%" Pd "",
                      OSThread::ThreadIdToIntPtr(os_thread()->trace_id()));
+  jsobj.AddProperty("kind", TaskKindToCString(task_kind()));
   Zone* zone = zone_;
   {
     JSONArray zone_info_array(&jsobj, "zones");
     zone = zone_;
     while (zone != NULL) {
       zone_info_array.AddValue(zone);
       zone = zone->previous();
     }
   }
 }
@@ skipping 33 matching lines @@
   ASSERT(!value.IsNull());
   sticky_error_ = value.raw();
 }
 
 
 void Thread::clear_sticky_error() {
   sticky_error_ = Error::null();
 }
 
 
+const char* Thread::TaskKindToCString(TaskKind kind) {
+  switch (kind) {
+    case kUnknownTask:
+      return "kUnknownTask";
+    case kMutatorTask:
+      return "kMutatorTask";
+    case kCompilerTask:
+      return "kCompilerTask";
+    case kSweeperTask:
+      return "kSweeperTask";
+    case kMarkerTask:
+      return "kMarkerTask";
+    case kFinalizerTask:
+      return "kFinalizerTask";
+    default:
+      UNREACHABLE();
+      return "";
+  }
+}
+
+
 bool Thread::EnterIsolate(Isolate* isolate) {
   const bool kIsMutatorThread = true;
   Thread* thread = isolate->ScheduleThread(kIsMutatorThread);
   if (thread != NULL) {
     ASSERT(thread->store_buffer_block_ == NULL);
     thread->task_kind_ = kMutatorTask;
     thread->StoreBufferAcquire();
     return true;
   }
   return false;
@@ skipping 515 matching lines @@
 
 DisableThreadInterruptsScope::~DisableThreadInterruptsScope() {
   if (thread() != NULL) {
     OSThread* os_thread = thread()->os_thread();
     ASSERT(os_thread != NULL);
     os_thread->EnableThreadInterrupts();
   }
 }
 
 }  // namespace dart