Initial prototype of vmstats support, based on Dart VM Stats draft design doc.

runtime/bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/dbg_connection.h"
 #include "bin/directory.h"
 #include "bin/eventhandler.h"
 #include "bin/extensions.h"
 #include "bin/file.h"
 #include "bin/isolate_data.h"
 #include "bin/log.h"
 #include "bin/platform.h"
 #include "bin/process.h"
+#include "bin/vmstats_impl.h"
 #include "platform/globals.h"
 
 // snapshot_buffer points to a snapshot if we link in a snapshot otherwise
 // it is initialized to NULL.
 extern const uint8_t* snapshot_buffer;
 
 
 // Global state that stores a pointer to the application script snapshot.
 static bool use_script_snapshot = false;
 static bool generate_script_snapshot = false;
 static File* snapshot_file = NULL;
 
 
 // Global state that indicates whether there is a debug breakpoint.
 // This pointer points into an argv buffer and does not need to be
 // free'd.
 static const char* breakpoint_at = NULL;
 
 
 // Global state that indicates whether we should open a connection
 // and listen for a debugger to connect.
 static bool start_debugger = false;
 static const int DEFAULT_DEBUG_PORT = 5858;
 static const char* DEFAULT_DEBUG_IP = "127.0.0.1";
 static const char* debug_ip = DEFAULT_DEBUG_IP;
 static int debug_port = 0;
 
+// Global state that defines the VmStats web server port and root directory.
+static int vmstats_port = 0;
+static const char* vmstats_root = NULL;
 
 // Value of the --package-root flag.
 // (This pointer points into an argv buffer and does not need to be
 // free'd.)
 static const char* package_root = NULL;
 
 
 // Global flag that is used to indicate that we want to compile all the
 // dart functions and not run anything.
 static bool has_compile_all = false;
@@ skipping 97 matching lines @@
     if (snapshot_file == NULL) {
       Log::PrintErr("Unable to open file %s for reading the snapshot\n",
                     filename);
       return false;
     }
   }
   return true;
 }
 
 
+static bool ProcessVmStatsOption(const char* port) {
+  ASSERT(port != NULL);
+  if (*port == '\0') {
+    vmstats_port = -1;  // Dynamically assigned port number.
+  } else {
+    if ((*port == '=') || (*port == ':')) {
+      vmstats_port = atoi(port + 1);
+    }
+  }
+  if (vmstats_port == 0) {
+    Log::PrintErr("unrecognized --stats option syntax. "
+                    "Use --stats[:<port number>]\n");
+    return false;
+  }
+  return true;
+}
+
+
+static bool ProcessVmStatsRootOption(const char* arg) {
+  ASSERT(arg != NULL);
+  vmstats_root = arg;
+  return true;
+}
+
+
 static bool ProcessGenScriptSnapshotOption(const char* filename) {
   if (filename != NULL && strlen(filename) != 0) {
     // Ensure that are already running using a full snapshot.
     if (snapshot_buffer == NULL) {
       Log::PrintErr("Script snapshots cannot be generated in this version of"
                     " dart\n");
       return false;
     }
     if (use_script_snapshot) {
       Log::PrintErr("Incompatible options specified --use-script-snapshot "
@@ skipping 23 matching lines @@
   { "--verbose", ProcessVerboseOption },
   { "-v", ProcessVerboseOption },
   { "--package-root=", ProcessPackageRootOption },
   { "-p", ProcessPackageRootOption },
   // VM specific options to the standalone dart program.
   { "--break_at=", ProcessBreakpointOption },
   { "--compile_all", ProcessCompileAllOption },
   { "--debug", ProcessDebugOption },
   { "--use-script-snapshot=", ProcessUseScriptSnapshotOption },
   { "--generate-script-snapshot=", ProcessGenScriptSnapshotOption },
+  { "--stats-root=", ProcessVmStatsRootOption },
+  { "--stats", ProcessVmStatsOption },
   { NULL, NULL }
 };
 
 
 static bool ProcessMainOptions(const char* option) {
   int i = 0;
   const char* name = main_options[0].option_name;
   while (name != NULL) {
     int length = strlen(name);
     if (strncmp(option, name, length) == 0) {
@@ skipping 261 matching lines @@
     char errbuf[256];
     snprintf(errbuf, sizeof(errbuf),
              "Expected a library when loading script: %s",
              script_uri);
     *error = strdup(errbuf);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
   Dart_ExitScope();
+  dart::VmStats::AddIsolate(reinterpret_cast<IsolateData*>(data), isolate);
   return true;
 }
 
 
 static bool CreateIsolateAndSetup(const char* script_uri,
                                   const char* main,
                                   void* data, char** error) {
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
                                      new IsolateData(),
@@ skipping 42 matching lines @@
 "  sets a breakpoint at specified location where <location> is one of :\n"
 "  url:<line_num> e.g. test.dart:10\n"
 "  [<class_name>.]<function_name> e.g. B.foo\n"
 "\n"
 "--use-script-snapshot=<file_name>\n"
 "  executes Dart script present in the specified snapshot file\n"
 "\n"
 "--generate-script-snapshot=<file_name>\n"
 "  loads Dart script and generates a snapshot in the specified file\n"
 "\n"
+"--stats[:<port number>]\n"
+"  enables VM stats service and listens on specified port for HTTP requests\n"
+"  (default port number is dynamically assigned)\n"
+"\n"

[siva, 2013/02/15 05:59:10]

Should we also list help for the '--stats-root' option here.

[Tom Ball, 2013/02/16 00:57:19]

Done.

 "The following options are only used for VM development and may\n"
 "be changed in any future version:\n");
     const char* print_flags = "--print_flags";
     Dart_SetVMFlags(1, &print_flags);
   }
 }
 
 
 static Dart_Handle SetBreakpoint(const char* breakpoint_at,
                                  Dart_Handle library) {
@@ skipping 57 matching lines @@
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 
   return kErrorExitCode;
 }
 
 
 static void ShutdownIsolate(void* callback_data) {
   IsolateData* isolate_data = reinterpret_cast<IsolateData*>(callback_data);
+  dart::VmStats::RemoveIsolate(isolate_data);
   EventHandler* handler = isolate_data->event_handler;
   if (handler != NULL) handler->Shutdown();
   delete isolate_data;
 }
 
 
 int main(int argc, char** argv) {
   char* executable_name;
   char* script_name;
   CommandLineOptions vm_options(argc);
@@ skipping 66 matching lines @@
     return kErrorExitCode;  // Indicates we encountered an error.
   }
   delete [] isolate_name;
 
   Dart_Isolate isolate = Dart_CurrentIsolate();
   ASSERT(isolate != NULL);
   Dart_Handle result;
 
   Dart_EnterScope();
 
+  if (vmstats_port > 0) {

[siva, 2013/02/15 05:59:10]

What about the case when vmstats_port is -1 ?

[Tom Ball, 2013/02/16 00:57:19]

Good catch. It turns out 0 is the official dynamic port, not -1 (Linux will take
either, but it's probably not cross-platform). I changed it so -1 indicates "no
port specified", and 0 means dynamic port, and updated this test.

+    dart::VmStats::Start(vmstats_port, vmstats_root);
+  }
+
   if (generate_script_snapshot) {
     // First create a snapshot.
     Dart_Handle result;
     uint8_t* buffer = NULL;
     intptr_t size = 0;
     result = Dart_CreateScriptSnapshot(&buffer, &size);
     if (Dart_IsError(result)) {
       Log::PrintErr("%s\n", Dart_GetError(result));
       Dart_ExitScope();
       Dart_ShutdownIsolate();
@@ skipping 40 matching lines @@
       return ErrorExit("%s\n", Dart_GetError(result));
     }
     // Keep handling messages until the last active receive port is closed.
     result = Dart_RunLoop();
     if (Dart_IsError(result)) {
       return ErrorExit("%s\n", Dart_GetError(result));
     }
   }
 
   Dart_ExitScope();
+  dart::VmStats::Stop();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
   // Free copied argument strings if converted.
   if (argv_converted) {
     for (int i = 0; i < argc; i++) free(argv[i]);
   }
 
   return Process::GlobalExitCode();
 }