Initial isolate reload support

runtime/vm/service_event.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/service_event.h"
 
 #include "vm/message_handler.h"
 
 namespace dart {
 
@@ skipping 27 matching lines @@
 ServiceEvent::ServiceEvent(Isolate* isolate, EventKind event_kind)
     : isolate_(isolate),
       kind_(event_kind),
       embedder_kind_(NULL),
       embedder_stream_id_(NULL),
       breakpoint_(NULL),
       top_frame_(NULL),
       timeline_event_block_(NULL),
       extension_rpc_(NULL),
       exception_(NULL),
+      reload_error_(NULL),
       at_async_jump_(false),
       inspectee_(NULL),
       gc_stats_(NULL),
       bytes_(NULL),
       bytes_length_(0),
       timestamp_(OS::GetCurrentTimeMillis()) {
   if ((event_kind == ServiceEvent::kPauseStart) &&
       !isolate->message_handler()->is_paused_on_start()) {
     // We will pause on start but the message handler lacks a valid
     // paused timestamp because we haven't paused yet. Use the current time.
@@ skipping 47 matching lines @@
     case kIsolateStart:
       return "IsolateStart";
     case kIsolateRunnable:
       return "IsolateRunnable";
     case kIsolateExit:
       return "IsolateExit";
     case kIsolateUpdate:
       return "IsolateUpdate";
     case kServiceExtensionAdded:
       return "ServiceExtensionAdded";
+    case kIsolateReload:
+      return "IsolateReload";
     case kPauseStart:
       return "PauseStart";
     case kPauseExit:
       return "PauseExit";
     case kPauseBreakpoint:
       return "PauseBreakpoint";
     case kPauseInterrupted:
       return "PauseInterrupted";
     case kPauseException:
       return "PauseException";
@@ skipping 32 matching lines @@
 
 const char* ServiceEvent::stream_id() const {
   switch (kind()) {
     case kVMUpdate:
       return Service::vm_stream.id();
 
     case kIsolateStart:
     case kIsolateRunnable:
     case kIsolateExit:
     case kIsolateUpdate:
+    case kIsolateReload:
     case kServiceExtensionAdded:
       return Service::isolate_stream.id();
 
     case kPauseStart:
     case kPauseExit:
     case kPauseBreakpoint:
     case kPauseInterrupted:
     case kPauseException:
     case kNone:
     case kResume:
@@ skipping 22 matching lines @@
     default:
       UNREACHABLE();
       return NULL;
   }
 }
 
 
 void ServiceEvent::PrintJSON(JSONStream* js) const {
   JSONObject jsobj(js);
   PrintJSONHeader(&jsobj);
+  if (kind() == kIsolateReload) {
+    if (reload_error_ == NULL) {
+      jsobj.AddProperty("status", "success");
+    } else {
+      jsobj.AddProperty("status", "failure");
+      jsobj.AddProperty("reloadError", *(reload_error()));
+    }
+  }
   if (kind() == kServiceExtensionAdded) {
     ASSERT(extension_rpc_ != NULL);
     jsobj.AddProperty("extensionRPC", extension_rpc_->ToCString());
   }
   if (kind() == kPauseBreakpoint) {
     JSONArray jsarr(&jsobj, "pauseBreakpoints");
     // TODO(rmacnak): If we are paused at more than one breakpoint,
     // provide it here.
     if (breakpoint() != NULL) {
       jsarr.AddValue(breakpoint());
@@ skipping 65 matching lines @@
   } else {
     jsobj->AddProperty("isolate", isolate());
   }
   ASSERT(timestamp_ != -1);
   jsobj->AddPropertyTimeMillis("timestamp", timestamp_);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart