Service cleanups...

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"
 
 namespace dart {
 
 // Translate from the legacy DebugEvent to a ServiceEvent.
 static ServiceEvent::EventType TranslateEventType(
@@ skipping 78 matching lines @@
       return "Unknown";
   }
 }
 
 
 void ServiceEvent::PrintJSON(JSONStream* js) const {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "Event");
   jsobj.AddProperty("kind", EventTypeToCString(type()));
   jsobj.AddProperty("isolate", isolate());
-  if (breakpoint() != NULL) {
-    jsobj.AddProperty("breakpoint", breakpoint());
+  if (type() == 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());
+    }
+  } else {
+    if (breakpoint() != NULL) {
+      jsobj.AddProperty("breakpoint", breakpoint());
+    }
   }
   if (top_frame() != NULL) {
     JSONObject jsFrame(&jsobj, "topFrame");
     top_frame()->PrintToJSONObject(&jsFrame);
     intptr_t index = 0;  // Avoid ambiguity in call to AddProperty.
     jsFrame.AddProperty("index", index);
   }
   if (exception() != NULL) {
     jsobj.AddProperty("exception", *(exception()));
   }
   if (inspectee() != NULL) {
     jsobj.AddProperty("inspectee", *(inspectee()));
   }
   if (gc_stats() != NULL) {
     jsobj.AddProperty("reason", Heap::GCReasonToString(gc_stats()->reason_));
     isolate()->heap()->PrintToJSONObject(Heap::kNew, &jsobj);
     isolate()->heap()->PrintToJSONObject(Heap::kOld, &jsobj);
   }
 }
 
 }  // namespace dart