Do not JSON encode the 'result' of a service rpc.

runtime/vm/heap.cc

 // Copyright (c) 2012, 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/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/object.h"
 #include "vm/object_set.h"
 #include "vm/os.h"
 #include "vm/pages.h"
 #include "vm/raw_object.h"
 #include "vm/scavenger.h"
 #include "vm/service.h"
+#include "vm/service_event.h"
 #include "vm/stack_frame.h"
 #include "vm/tags.h"
 #include "vm/verifier.h"
 #include "vm/virtual_memory.h"
 #include "vm/weak_table.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, disable_alloc_stubs_after_gc, false, "Stress testing flag.");
 DEFINE_FLAG(bool, gc_at_alloc, false, "GC at every allocation.");
@@ skipping 584 matching lines @@
     new_space_->IncrementCollections();
   } else {
     old_space_->AddGCTime(delta);
     old_space_->IncrementCollections();
   }
   stats_.after_.new_ = new_space_->GetCurrentUsage();
   stats_.after_.old_ = old_space_->GetCurrentUsage();
   ASSERT(gc_in_progress_);
   gc_in_progress_ = false;
   if (Service::NeedsEvents()) {
-    GCEvent event(stats_);
-    Service::HandleGCEvent(&event);
+    ServiceEvent event(Isolate::Current(), ServiceEvent::kGC);
+    event.set_gc_stats(&stats_);
+    Service::HandleEvent(&event);
   }
 }
 
 
 void Heap::PrintStats() {
   if (!FLAG_verbose_gc) return;
 
   if ((FLAG_verbose_gc_hdr != 0) &&
       (((stats_.num_ - 1) % FLAG_verbose_gc_hdr) == 0)) {
     OS::PrintErr("[    GC    |  space  | count | start | gc time | "
@@ skipping 38 matching lines @@
     MicrosecondsToMilliseconds(stats_.times_[1]),
     MicrosecondsToMilliseconds(stats_.times_[2]),
     MicrosecondsToMilliseconds(stats_.times_[3]),
     stats_.data_[0],
     stats_.data_[1],
     stats_.data_[2],
     stats_.data_[3]);
 }
 
 
-void GCEvent::PrintJSON(JSONStream* js) const {
-  Isolate* isolate = Isolate::Current();
-  {
-    JSONObject jsobj(js);
-    jsobj.AddProperty("type", "ServiceEvent");
-    jsobj.AddPropertyF("id", "gc/%" Pd, stats_.num_);
-    jsobj.AddProperty("eventType", "GC");  // TODO(koda): "GarbageCollected"
-    jsobj.AddProperty("isolate", isolate);
-    jsobj.AddProperty("reason", Heap::GCReasonToString(stats_.reason_));
-    isolate->heap()->PrintToJSONObject(Heap::kNew, &jsobj);
-    isolate->heap()->PrintToJSONObject(Heap::kOld, &jsobj);
-  }
-}
-
-
 #if defined(DEBUG)
 NoSafepointScope::NoSafepointScope() : StackResource(Isolate::Current()) {
   isolate()->IncrementNoSafepointScopeDepth();
 }
 
 
 NoSafepointScope::~NoSafepointScope() {
   isolate()->DecrementNoSafepointScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 
 NoHeapGrowthControlScope::NoHeapGrowthControlScope()
     : StackResource(Isolate::Current()) {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     current_growth_controller_state_ = heap->GrowthControlState();
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart