Complete the switch to ServiceObject

runtime/vm/class_table.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/class_table.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/heap.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
@@ skipping 225 matching lines @@
   last_reset.new_size = recent.new_size;
   last_reset.old_count = recent.old_count;
   last_reset.old_size = recent.old_size;
   accumulated.Reset();
 }
 
 
 void ClassHeapStats::PrintTOJSONArray(const Class& cls, JSONArray* array) {
   JSONObject obj(array);
   obj.AddProperty("type", "ClassHeapStats");
+  obj.AddPropertyF("id", "allocationprofile/%" Pd "", cls.id());
   obj.AddProperty("class", cls);
   {
     JSONArray new_stats(&obj, "new");
     new_stats.AddValue(pre_gc.new_count);
     new_stats.AddValue(pre_gc.new_size);
     new_stats.AddValue(post_gc.new_count);
     new_stats.AddValue(post_gc.new_size);
     new_stats.AddValue(recent.new_count);
     new_stats.AddValue(recent.new_size);
     new_stats.AddValue64(accumulated.new_count + recent.new_count -
@@ skipping 68 matching lines @@
 }
 
 
 void ClassTable::AllocationProfilePrintToJSONStream(JSONStream* stream) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   Heap* heap = isolate->heap();
   ASSERT(heap != NULL);
   JSONObject obj(stream);
   obj.AddProperty("type", "AllocationProfile");
+  obj.AddProperty("id", "allocationprofile");
   {
     JSONObject heaps(&obj, "heaps");
     {
       heap->PrintToJSONObject(Heap::kNew, &heaps);
     }
     {
       heap->PrintToJSONObject(Heap::kOld, &heaps);
     }
   }
   {
@@ skipping 80 matching lines @@
 
 void ClassTable::UpdateLiveNew(intptr_t cid, intptr_t size) {
   ClassHeapStats* stats = StatsAt(cid);
   ASSERT(stats != NULL);
   ASSERT(size >= 0);
   stats->post_gc.AddNew(size);
 }
 
 
 }  // namespace dart