Add --observe flag alias

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"
@@ skipping 67 matching lines @@
 static bool IsValidFlag(const char* name,
                         const char* prefix,
                         intptr_t prefix_length) {
   intptr_t name_length = strlen(name);
   return ((name_length > prefix_length) &&
           (strncmp(name, prefix, prefix_length) == 0));
 }
 
 
 static bool has_version_option = false;
-static bool ProcessVersionOption(const char* arg) {
+static bool ProcessVersionOption(const char* arg,
+                                 CommandLineOptions* vm_options) {
   if (*arg != '\0') {
     return false;
   }
   has_version_option = true;
   return true;
 }
 
 
 static bool has_help_option = false;
-static bool ProcessHelpOption(const char* arg) {
+static bool ProcessHelpOption(const char* arg, CommandLineOptions* vm_options) {
   if (*arg != '\0') {
     return false;
   }
   has_help_option = true;
   return true;
 }
 
 
 static bool has_verbose_option = false;
-static bool ProcessVerboseOption(const char* arg) {
+static bool ProcessVerboseOption(const char* arg,
+                                 CommandLineOptions* vm_options) {
   if (*arg != '\0') {
     return false;
   }
   has_verbose_option = true;
   return true;
 }
 
 
-static bool ProcessBreakpointOption(const char* funcname) {
+static bool ProcessBreakpointOption(const char* funcname,
+                                    CommandLineOptions* vm_options) {
   ASSERT(funcname != NULL);
   if (*funcname == '\0') {
     return false;
   }
   breakpoint_at = funcname;
   return true;
 }
 
 
-static bool ProcessPackageRootOption(const char* arg) {
+static bool ProcessPackageRootOption(const char* arg,
+                                     CommandLineOptions* vm_options) {
   ASSERT(arg != NULL);
   if (*arg == '\0' || *arg == '-') {
     return false;
   }
   package_root = arg;
   return true;
 }
 
 
 static void* GetHashmapKeyFromString(char* key) {
@@ skipping 37 matching lines @@
     if (option_value[1 + n] == '\0') {
       *out_ip = slash + 1;
       *out_port = port;
       return true;
     }
   }
   return false;
 }
 
 
-static bool ProcessEnvironmentOption(const char* arg) {
+static bool ProcessEnvironmentOption(const char* arg,
+                                     CommandLineOptions* vm_options) {
   ASSERT(arg != NULL);
   if (*arg == '\0') {
     // Ignore empty -D option.
     Log::PrintErr("No arguments given to -D option\n");
     return true;
   }
   if (environment == NULL) {
     environment = new HashMap(&HashMap::SameStringValue, 4);
   }
   // Split the name=value part of the -Dname=value argument.
@@ skipping 17 matching lines @@
     value = strdup(equals_pos + 1);
   }
   HashMap::Entry* entry = environment->Lookup(
       GetHashmapKeyFromString(name), HashMap::StringHash(name), true);
   ASSERT(entry != NULL);  // Lookup adds an entry if key not found.
   entry->value = value;
   return true;
 }
 
 
-static bool ProcessCompileAllOption(const char* arg) {
+static bool ProcessCompileAllOption(const char* arg,
+                                    CommandLineOptions* vm_options) {
   ASSERT(arg != NULL);
   if (*arg != '\0') {
     return false;
   }
   has_compile_all = true;
   return true;
 }
 
-static bool ProcessDebugOption(const char* option_value) {
+static bool ProcessDebugOption(const char* option_value,
+                               CommandLineOptions* vm_options) {
   ASSERT(option_value != NULL);
   if (!ExtractPortAndIP(option_value, &debug_port, &debug_ip,
                         DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_IP)) {
     Log::PrintErr("unrecognized --debug option syntax. "
                   "Use --debug[:<port number>[/<IPv4 address>]]\n");
     return false;
   }
 
   breakpoint_at = "main";
   start_debugger = true;
   return true;
 }
 
 
-static bool ProcessPrintScriptOption(const char* arg) {
+static bool ProcessPrintScriptOption(const char* arg,
+                                     CommandLineOptions* vm_options) {
   ASSERT(arg != NULL);
   if (*arg != '\0') {
     return false;
   }
   has_print_script = true;
   return true;
 }
 
 
-static bool ProcessGenScriptSnapshotOption(const char* filename) {
+static bool ProcessGenScriptSnapshotOption(const char* filename,
+                                           CommandLineOptions* vm_options) {
   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;
     }
     snapshot_file = File::Open(filename, File::kWriteTruncate);
     if (snapshot_file == NULL) {
       Log::PrintErr("Unable to open file %s for writing the snapshot\n",
                     filename);
       return false;
     }
     generate_script_snapshot = true;
     return true;
   }
   return false;
 }
 
 
-static bool ProcessEnableVmServiceOption(const char* option_value) {
+static bool ProcessEnableVmServiceOption(const char* option_value,
+                                         CommandLineOptions* vm_options) {
   ASSERT(option_value != NULL);
 
   if (!ExtractPortAndIP(option_value,
                         &vm_service_server_port,
                         &vm_service_server_ip,
                         DEFAULT_VM_SERVICE_SERVER_PORT,
                         DEFAULT_VM_SERVICE_SERVER_IP)) {
     Log::PrintErr("unrecognized --enable-vm-service option syntax. "

[bakster, 2014/05/27 07:34:28]

If this function is called from ProcessObserveOption and it ExtractPortAndIP
fails the error message is misleading.

                   "Use --enable-vm-service[:<port number>[/<IPv4 address>]]\n");
     return false;
   }
 
   start_vm_service = true;
   return true;
 }
 
+static bool ProcessObserveOption(const char* option_value,
+                                 CommandLineOptions* vm_options) {
+  ASSERT(option_value != NULL);

[bakster, 2014/05/27 07:34:28]

The assert is not needed since ProcessEnableVmServiceOption has an asset.

+
+  if (!ProcessEnableVmServiceOption(option_value, vm_options)) {
+    return false;
+  }
+  vm_options->AddArgument("--pause-isolates-on-exit");
+  return true;
+}
+
+
 bool trace_debug_protocol = false;
-static bool ProcessTraceDebugProtocolOption(const char* arg) {
+static bool ProcessTraceDebugProtocolOption(const char* arg,
+                                            CommandLineOptions* vm_options) {
   if (*arg != '\0') {
     return false;
   }
   trace_debug_protocol = true;
   return true;
 }
 
 
 static struct {
   const char* option_name;
-  bool (*process)(const char* option);
+  bool (*process)(const char* option, CommandLineOptions* vm_options);
 } main_options[] = {
   // Standard options shared with dart2js.
   { "--version", ProcessVersionOption },
   { "--help", ProcessHelpOption },
   { "-h", ProcessHelpOption },
   { "--verbose", ProcessVerboseOption },
   { "-v", ProcessVerboseOption },
   { "--package-root=", ProcessPackageRootOption },
   { "-D", ProcessEnvironmentOption },
   // VM specific options to the standalone dart program.
   { "--break-at=", ProcessBreakpointOption },
   { "--compile_all", ProcessCompileAllOption },
   { "--debug", ProcessDebugOption },
   { "--snapshot=", ProcessGenScriptSnapshotOption },
   { "--print-script", ProcessPrintScriptOption },
   { "--enable-vm-service", ProcessEnableVmServiceOption },
+  { "--observe", ProcessObserveOption },
   { "--trace-debug-protocol", ProcessTraceDebugProtocolOption },
   { NULL, NULL }
 };
 
 
-static bool ProcessMainOptions(const char* option) {
+static bool ProcessMainOptions(const char* option,
+                               CommandLineOptions* vm_options) {
   int i = 0;
   const char* name = main_options[0].option_name;
   int option_length = strlen(option);
   while (name != NULL) {
     int length = strlen(name);
     if ((option_length >= length) && (strncmp(option, name, length) == 0)) {
-      if (main_options[i].process(option + length)) {
+      if (main_options[i].process(option + length, vm_options)) {
         return true;
       }
     }
     i += 1;
     name = main_options[i].option_name;
   }
   return false;
 }
 
 
@@ skipping 28 matching lines @@
   const intptr_t kPrefixLen = strlen(kPrefix);
 
   // Store the executable name.
   Platform::SetExecutableName(argv[0]);
 
   // Start the rest after the executable name.
   int i = 1;
 
   // Parse out the vm options.
   while (i < argc) {
-    if (ProcessMainOptions(argv[i])) {
+    if (ProcessMainOptions(argv[i], vm_options)) {
       i++;
     } else {
       // Check if this flag is a potentially valid VM flag.
       const char* kChecked = "-c";
       const char* kPackageRoot = "-p";
       if (strncmp(argv[i], kPackageRoot, strlen(kPackageRoot)) == 0) {
-        if (!ProcessPackageRootOption(argv[i] + strlen(kPackageRoot))) {
+        if (!ProcessPackageRootOption(argv[i] + strlen(kPackageRoot),
+                                      vm_options)) {
           i++;
-          if ((argv[i] == NULL) || !ProcessPackageRootOption(argv[i])) {
+          if ((argv[i] == NULL) ||
+               !ProcessPackageRootOption(argv[i], vm_options)) {
             Log::PrintErr("Invalid option specification : '%s'\n", argv[i - 1]);
             i++;
             break;
           }
         }
       } else if (strncmp(argv[i], kChecked, strlen(kChecked)) == 0) {
         vm_options->AddArgument("--checked");
       } else if (!IsValidFlag(argv[i], kPrefix, kPrefixLen)) {
         break;
       }
@@ skipping 724 matching lines @@
   exit(Process::GlobalExitCode());
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   dart::bin::main(argc, argv);
   UNREACHABLE();
 }