Synced basic_debugger_test start on new "debugger initialized" message.

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 275 matching lines @@
 
 
 // Parse out the command line arguments. Returns -1 if the arguments
 // are incorrect, 0 otherwise.
 static int ParseArguments(int argc,
                           char** argv,
                           CommandLineOptions* vm_options,
                           char** executable_name,
                           char** script_name,
                           CommandLineOptions* dart_options,
-                          bool* print_flags_seen) {
+                          bool* print_flags_seen,
+                          bool* verbose_debug_seen) {
   const char* kPrefix = "--";
   const intptr_t kPrefixLen = strlen(kPrefix);
 
   // Get the executable name.
   *executable_name = argv[0];
 
   // Start the rest after the executable name.
   int i = 1;
 
   // Parse out the vm options.
   while (i < argc) {
     if (ProcessMainOptions(argv[i])) {
       i++;
     } else {
       // Check if this flag is a potentially valid VM flag.
       if (!IsValidFlag(argv[i], kPrefix, kPrefixLen)) {
         break;
       }
       const char* kPrintFlags1 = "--print-flags";
       const char* kPrintFlags2 = "--print_flags";
       if ((strncmp(argv[i], kPrintFlags1, strlen(kPrintFlags1)) == 0) ||
           (strncmp(argv[i], kPrintFlags2, strlen(kPrintFlags2)) == 0)) {
         *print_flags_seen = true;
       }
+      const char* kVerboseDebug = "--verbose_debug";
+      if (strncmp(argv[i], kVerboseDebug, strlen(kVerboseDebug)) == 0) {
+        *verbose_debug_seen = true;
+      }
       vm_options->AddArgument(argv[i]);
       i++;
     }
   }
 
 
   // Get the script name.
   if (i < argc) {
     *script_name = argv[i];
     i++;
@@ skipping 339 matching lines @@
   return Dart_True();
 }
 
 
 int main(int argc, char** argv) {
   char* executable_name;
   char* script_name;
   CommandLineOptions vm_options(argc);
   CommandLineOptions dart_options(argc);
   bool print_flags_seen = false;
+  bool verbose_debug_seen = false;
 
   // Perform platform specific initialization.
   if (!Platform::Initialize()) {
     Log::PrintErr("Initialization failed\n");
   }
 
   // On Windows, the argv strings are code page encoded and not
   // utf8. We need to convert them to utf8.
   bool argv_converted = Utf8ConvertArgv(argc, argv);
 
   // Parse command line arguments.
   if (ParseArguments(argc,
                      argv,
                      &vm_options,
                      &executable_name,
                      &script_name,
                      &dart_options,
-                     &print_flags_seen) < 0) {
+                     &print_flags_seen,
+                     &verbose_debug_seen) < 0) {
     if (has_help_option) {
       PrintUsage();
       return 0;
     } else if (has_version_option) {
       PrintVersion();
       return 0;
     } else if (print_flags_seen) {
       // Will set the VM flags, print them out and then we exit as no
       // script was specified on the command line.
       Dart_SetVMFlags(vm_options.count(), vm_options.arguments());
@@ skipping 13 matching lines @@
     fflush(stderr);
     return kErrorExitCode;
   }
 
   DartUtils::SetOriginalWorkingDirectory();
 
   // Start the debugger wire protocol handler if necessary.
   if (start_debugger) {
     ASSERT(debug_port != 0);
     DebuggerConnectionHandler::StartHandler(debug_ip, debug_port);
+    if (verbose_debug_seen) {
+      Log::Print("Debugger initialized\n");
+    }
   }
 
   // Call CreateIsolateAndSetup which creates an isolate and loads up
   // the specified application script.
   char* error = NULL;
   char* isolate_name = BuildIsolateName(script_name, "main");
   if (!CreateIsolateAndSetupHelper(script_name,
                                    "main",
                                    new IsolateData(),
                                    &error)) {
@@ skipping 90 matching lines @@
   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();
 }