Added JSON reporting to reload.

runtime/vm/isolate_reload.cc

 // Copyright (c) 2016, 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_reload.h"
 
 #include "vm/become.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
@@ skipping 144 matching lines @@
 void InstanceMorpher::Dump() const {
   LogBlock blocker;
   THR_Print("Morphing from ");
   DumpFormatFor(from_);
   THR_Print("To ");
   DumpFormatFor(to_);
   THR_Print("\n");
 }
 
 
+void InstanceMorpher::AppendTo(JSONArray* array) {
+  JSONObject jsobj(array);
+  jsobj.AddProperty("type", "Morpher");
+  jsobj.AddProperty("class", to_);
+  jsobj.AddProperty("instances", before()->length());
+  JSONArray map(&jsobj, "mapping");
+  for (int i = 0; i < mapping_.length(); i += 2) {
+    JSONArray pair(&map);
+    pair.AddValue(mapping_.At(i));
+    pair.AddValue(mapping_.At(i+1));
+  }
+}
+
+
 void ReasonForCancelling::Report(IsolateReloadContext* context) {
   const Error& error = Error::Handle(ToError());
   context->ReportError(error);
 }
 
 
 RawError* ReasonForCancelling::ToError() {
   // By default create the error returned from ToString.
   const String& message = String::Handle(ToString());
   return LanguageError::New(message);
 }
 
 
 RawString* ReasonForCancelling::ToString() {
   UNREACHABLE();
   return NULL;
 }
 
 
+void ReasonForCancelling::AppendTo(JSONArray* array) {
+  JSONObject jsobj(array);
+  jsobj.AddProperty("type", "ReasonForCancelling");
+  const String& message = String::Handle(ToString());
+  jsobj.AddProperty("message", message);
+}
+
+
+void ClassReasonForCancelling::AppendTo(JSONArray* array) {
+  JSONObject jsobj(array);
+  jsobj.AddProperty("type", "ReasonForCancelling");
+  jsobj.AddProperty("class", from_);
+  const String& message = String::Handle(ToString());
+  jsobj.AddProperty("message", message);
+}
+
 RawError* IsolateReloadContext::error() const {
   ASSERT(has_error());
   // Report the first error to the surroundings.
   const Error& error =
       Error::Handle(reasons_to_cancel_reload_.At(0)->ToError());
   OS::Print("[[%s]]\n", error.ToCString());
   return error.raw();
 }
 
+
 class ScriptUrlSetTraits {
  public:
   static bool ReportStats() { return false; }
   static const char* Name() { return "ScriptUrlSetTraits"; }
 
   static bool IsMatch(const Object& a, const Object& b) {
     if (!a.IsString() || !b.IsString()) {
       return false;
     }
 
@@ skipping 280 matching lines @@
   // not remove dead subclasses.  Rebuild the direct subclass
   // information from scratch.
   RebuildDirectSubclasses();
 
   if (FLAG_write_protect_code) {
     // Disable code page write protection while we are reloading.
     I->heap()->WriteProtectCode(true);
   }
 
   BackgroundCompiler::Enable();
+
+  if (FLAG_trace_reload) {
+    JSONStream stream;
+    ReportOnJSON(&stream);
+    OS::Print("\nJSON report:\n  %s\n", stream.ToCString());
+  }
 }
 
 
+void IsolateReloadContext::ReportOnJSON(JSONStream* stream) {
+  JSONObject jsobj(stream);
+  jsobj.AddProperty("type", "Reload");
+  jsobj.AddProperty("succeeded", !HasReasonsForCancelling());
+  if (HasReasonsForCancelling()) {
+    JSONArray array(&jsobj, "reasons");
+    for (intptr_t i = 0; i < reasons_to_cancel_reload_.length(); i++) {
+      ReasonForCancelling* reason = reasons_to_cancel_reload_.At(i);
+      reason->AppendTo(&array);
+    }
+  } else {
+    JSONArray array(&jsobj, "changes");
+    for (intptr_t i = 0; i < instance_morphers_.length(); i++) {
+      instance_morphers_.At(i)->AppendTo(&array);
+    }
+  }
+}
+
+
 void IsolateReloadContext::AbortReload(const Error& error) {
   AddReasonForCancelling(new Aborted(error));
   ReportReasonsForCancelling();
   Rollback();
 }
 
 
 void IsolateReloadContext::EnsuredUnoptimizedCodeForStack() {
   TIMELINE_SCOPE(EnsuredUnoptimizedCodeForStack);
   StackFrameIterator it(StackFrameIterator::kDontValidateFrames);
@@ skipping 885 matching lines @@
         ASSERT(!super_cls.IsNull());
         super_cls.AddDirectSubclass(cls);
       }
     }
   }
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart