Add current rss and embedder name to Observatory

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 91 matching lines @@
 // TODO(johnmccutchan): Unify embedder service handler lists and their APIs.
 EmbedderServiceHandler* Service::isolate_service_handler_head_ = NULL;
 EmbedderServiceHandler* Service::root_service_handler_head_ = NULL;
 struct ServiceMethodDescriptor;
 const ServiceMethodDescriptor* FindMethod(const char* method_name);
 
 // Support for streams defined in embedders.
 Dart_ServiceStreamListenCallback Service::stream_listen_callback_ = NULL;
 Dart_ServiceStreamCancelCallback Service::stream_cancel_callback_ = NULL;
 Dart_GetVMServiceAssetsArchive Service::get_service_assets_callback_ = NULL;
+Dart_EmbedderInformationCallback Service::embedder_information_callback_ = NULL;
 
 // These are the set of streams known to the core VM.
 StreamInfo Service::vm_stream("VM");
 StreamInfo Service::isolate_stream("Isolate");
 StreamInfo Service::debug_stream("Debug");
 StreamInfo Service::gc_stream("GC");
 StreamInfo Service::echo_stream("_Echo");
 StreamInfo Service::graph_stream("_Graph");
 StreamInfo Service::logging_stream("_Logging");
 StreamInfo Service::extension_stream("Extension");
@@ skipping 1098 matching lines @@
     Dart_ServiceStreamCancelCallback cancel_callback) {
   stream_listen_callback_ = listen_callback;
   stream_cancel_callback_ = cancel_callback;
 }
 
 void Service::SetGetServiceAssetsCallback(
     Dart_GetVMServiceAssetsArchive get_service_assets) {
   get_service_assets_callback_ = get_service_assets;
 }
 
+void Service::SetEmbedderInformationCallback(
+    Dart_EmbedderInformationCallback callback) {
+  embedder_information_callback_ = callback;
+}
+
+int64_t Service::CurrentRSS() {
+  if (embedder_information_callback_ == NULL) {
+    return -1;
+  }
+  Dart_EmbedderInformation info = {
+    0,  // version
+    NULL,  // name
+    0,  // max_rss
+    0  // current_rss
+  };
+  embedder_information_callback_(&info);
+  ASSERT(info.version == DART_EMBEDDER_INFORMATION_CURRENT_VERSION);
+  return info.current_rss;
+}
+
+int64_t Service::MaxRSS() {
+  if (embedder_information_callback_ == NULL) {
+    return -1;
+  }
+  Dart_EmbedderInformation info = {
+    0,  // version
+    NULL,  // name
+    0,  // max_rss
+    0  // current_rss
+  };
+  embedder_information_callback_(&info);
+  ASSERT(info.version == DART_EMBEDDER_INFORMATION_CURRENT_VERSION);
+  return info.max_rss;
+}
+
 EmbedderServiceHandler* Service::FindRootEmbedderHandler(const char* name) {
   EmbedderServiceHandler* current = root_service_handler_head_;
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
@@ skipping 2589 matching lines @@
     return;
   }
   jsobj.AddProperty("architectureBits", static_cast<intptr_t>(kBitsPerWord));
   jsobj.AddProperty("targetCPU", CPU::Id());
   jsobj.AddProperty("hostCPU", HostCPUFeatures::hardware());
   jsobj.AddProperty("version", Version::String());
   jsobj.AddProperty("_profilerMode", FLAG_profile_vm ? "VM" : "Dart");
   jsobj.AddProperty64("_nativeZoneMemoryUsage",
                       ApiNativeScope::current_memory_usage());
   jsobj.AddProperty64("pid", OS::ProcessId());
-  jsobj.AddProperty64("_maxRSS", OS::MaxRSS());
+  if (embedder_information_callback_ != NULL) {

[zra, 2017/08/14 18:26:32]

Possible cleanup: Pull this out into e.g.
Service::PrintJSONForEmbedderInformation()

[cbernaschina, 2017/08/14 20:07:40]

Done.

+    Dart_EmbedderInformation info = {
+      0,  // version
+      NULL,  // name
+      0,  // max_rss
+      0  // current_rss
+    };
+    embedder_information_callback_(&info);
+    ASSERT(info.version == DART_EMBEDDER_INFORMATION_CURRENT_VERSION);
+    if (info.name != NULL) {
+      jsobj.AddProperty("_embedder", info.name);
+    }
+    if (info.max_rss > 0) {
+      jsobj.AddProperty64("_maxRSS", info.max_rss);
+    }
+    if (info.max_rss > 0) {
+      jsobj.AddProperty64("_currentRSS", info.current_rss);
+    }
+  }
   jsobj.AddPropertyTimeMillis(
       "startTime", OS::GetCurrentTimeMillis() - Dart::UptimeMillis());
   MallocHooks::PrintToJSONObject(&jsobj);
   // Construct the isolate list.
   {
     JSONArray jsarr(&jsobj, "isolates");
     ServiceIsolateVisitor visitor(&jsarr);
     Isolate::VisitIsolates(&visitor);
   }
 }
@@ skipping 292 matching lines @@
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart