Added ability to request zone memory information for all isolates through the VM service and added …

runtime/vm/service.cc

 // Copyright (c) 2013, 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.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/globals.h"
 
@@ skipping 2928 matching lines @@
     return true;
   }
   Isolate* isolate = thread->isolate();
   ASSERT(isolate != NULL);
   StackZone zone(thread);
   Timeline::PrintFlagsToJSON(js);
   return true;
 }
 
 
+class ServiceIsolateVisitor : public IsolateVisitor {
+ public:
+  explicit ServiceIsolateVisitor(JSONArray* jsarr, bool ref = true)

[zra, 2016/12/13 23:37:02]

Since there are still only a small number of uses of this, I think we should
avoid using optional arguments.

[bkonyi, 2016/12/13 23:48:45]

Done.

+      : jsarr_(jsarr), ref_(ref) {}
+  virtual ~ServiceIsolateVisitor() {}
+
+  void VisitIsolate(Isolate* isolate) {
+    if (!IsVMInternalIsolate(isolate)) {
+      jsarr_->AddValue(isolate, ref_);
+    }
+  }
+
+ private:
+  JSONArray* jsarr_;
+  bool ref_;
+};
+
+
+static const MethodParameter* get_zone_memory_info_params[] = {
+    NO_ISOLATE_PARAMETER, NULL,
+};
+
+
+static bool GetZoneMemoryInfo(Thread* thread, JSONStream* js) {

[Cutch, 2016/12/14 17:18:15]

This is the same as getVM but with the full Isolate information for each isolate
instead of just a reference. A client can easily do this themselves.

+  JSONObject jsobj(js);
+  jsobj.AddProperty("type", "_ZoneMemoryInfo");

[bkonyi, 2016/12/13 22:37:48]

There's probably a better name for this type, but I couldn't think of one off
the top of my head. If you have suggestions, let me know.

[zra, 2016/12/13 23:37:02]

_AllIsolatesInfo? Not sure if this matches with the service's naming
conventions. Have to ask John.

+  {
+    JSONArray jsarr(&jsobj, "isolates");
+    ServiceIsolateVisitor visitor(&jsarr, false);
+    Isolate::VisitIsolates(&visitor);
+  }
+  return true;
+}
+
+
 static const MethodParameter* clear_vm_timeline_params[] = {
     NO_ISOLATE_PARAMETER, NULL,
 };
 
 
 static bool ClearVMTimeline(Thread* thread, JSONStream* js) {
   Isolate* isolate = thread->isolate();
   ASSERT(isolate != NULL);
   StackZone zone(thread);
 
@@ skipping 790 matching lines @@
   jsobj.AddProperty("major",
                     static_cast<intptr_t>(SERVICE_PROTOCOL_MAJOR_VERSION));
   jsobj.AddProperty("minor",
                     static_cast<intptr_t>(SERVICE_PROTOCOL_MINOR_VERSION));
   jsobj.AddProperty("_privateMajor", static_cast<intptr_t>(0));
   jsobj.AddProperty("_privateMinor", static_cast<intptr_t>(0));
   return true;
 }
 
 
-class ServiceIsolateVisitor : public IsolateVisitor {
- public:
-  explicit ServiceIsolateVisitor(JSONArray* jsarr) : jsarr_(jsarr) {}
-  virtual ~ServiceIsolateVisitor() {}
-
-  void VisitIsolate(Isolate* isolate) {
-    if (!IsVMInternalIsolate(isolate)) {
-      jsarr_->AddValue(isolate);
-    }
-  }
-
- private:
-  JSONArray* jsarr_;
-};
-
-
 static const MethodParameter* get_vm_params[] = {
     NO_ISOLATE_PARAMETER, NULL,
 };
 
 
 void Service::PrintJSONForVM(JSONStream* js, bool ref) {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", (ref ? "@VM" : "VM"));
   jsobj.AddProperty("name", GetVMName());
   if (ref) {
@@ skipping 293 matching lines @@
   { "getVM", GetVM,
     get_vm_params },
   { "_getVMMetric", GetVMMetric,
     get_vm_metric_params },
   { "_getVMMetricList", GetVMMetricList,
     get_vm_metric_list_params },
   { "_getVMTimeline", GetVMTimeline,
     get_vm_timeline_params },
   { "_getVMTimelineFlags", GetVMTimelineFlags,
     get_vm_timeline_flags_params },
+  { "_getZoneMemoryInfo", GetZoneMemoryInfo,

[bkonyi, 2016/12/13 22:37:48]

I'm not sure if this is the best name since what's really being returned is an
object containing an array of Isolate objects, which just happens to contain all
the thread + zone information. Would it make more sense to call it something to
do with getting all isolate information?

[zra, 2016/12/13 23:37:02]

If there isn't already something like that, then that would make sense to me,
but wait for John to comment.

+    get_zone_memory_info_params },
   { "pause", Pause,
     pause_params },
   { "removeBreakpoint", RemoveBreakpoint,
     remove_breakpoint_params },
   { "_restartVM", RestartVM,
     restart_vm_params },
   { "reloadSources", ReloadSources,
     reload_sources_params },
   { "_reloadSources", ReloadSources,
     reload_sources_params },
@@ skipping 25 matching lines @@
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart