Revised CL for customisable logging (replacing printfs).

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 "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 indicates whether perf_events symbol information
@@ skipping 105 matching lines @@
   ASSERT(port != NULL);
   debug_port = 0;
   if (*port == '\0') {
     debug_port = DEFAULT_DEBUG_PORT;
   } else {
     if ((*port == '=') || (*port == ':')) {
       debug_port = atoi(port + 1);
     }
   }
   if (debug_port == 0) {
-    fprintf(stderr, "unrecognized --debug option syntax. "
+    Log::PrintErr("unrecognized --debug option syntax. "
                     "Use --debug[:<port number>]\n");
     return false;
   }
   breakpoint_at = "main";
   start_debugger = true;
   return true;
 }
 
 
 static bool ProcessPerfEventsOption(const char* option) {
@@ skipping 353 matching lines @@
                                   const char* main,
                                   void* data, char** error) {
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
                                      new IsolateData(),
                                      error);
 }
 
 
 static void PrintVersion() {
-  fprintf(stderr, "Dart VM version: %s\n", Dart_VersionString());
+  Log::PrintErr("Dart VM version: %s\n", Dart_VersionString());
 }
 
 
 static void PrintUsage() {
-  fprintf(stderr,
+  Log::PrintErr(
       "Usage: dart [<vm-flags>] <dart-script-file> [<dart-options>]\n"
       "\n"
       "Executes the Dart script passed as <dart-script-file>.\n"
       "\n");
   if (!has_verbose_option) {
-    fprintf(stderr,
+    Log::PrintErr(
 "Common options:\n"
 "--checked Insert runtime type checks and enable assertions (checked mode).\n"
 "--version Print the VM version.\n"
 "--help    Display this message (add --verbose for information about all\n"
 "          VM options).\n");
   } else {
-    fprintf(stderr,
+    Log::PrintErr(
 "Supported options:\n"
 "--checked\n"
 "  Insert runtime type checks and enable assertions (checked mode).\n"
 "\n"
 "--version\n"
 "  Print the VM version.\n"
 "\n"
 "--help\n"
 "  Display this message (add --verbose for information about all VM options).\n"
 "\n"
@@ skipping 69 matching lines @@
   ASSERT(buffer != NULL);
   snprintf(buffer, len, kFormat, script_name, func_name);
   return buffer;
 }
 
 
 static const int kErrorExitCode = 255;  // Indicates we encountered an error.
 
 
 static int ErrorExit(const char* format, ...) {
+  char buf[1024];

[Ivan Posva, 2012/11/15 07:43:17]

This will make lots of users very unhappy. As the error messages will be cutoff.

[siva, 2012/11/15 18:46:48]

I agree, in fact we had a bug filed against us for this when I think we used to
initially cap it off at 1024 and people did not like it especially because some
of the script names are long after canonicalization.

[gram, 2012/11/15 21:16:50]

Done.

[gram, 2012/11/15 21:16:50]

Done.

   va_list arguments;
   va_start(arguments, format);
-  vfprintf(stderr, format, arguments);
+  vsnprintf(buf, sizeof(buf), format, arguments);

[Ivan Posva, 2012/11/15 18:59:44]

Why not use Log::VFPrint here?

[gram, 2012/11/15 21:16:50]

Done.

   va_end(arguments);
+  Log::PrintErr("%s", buf);
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 
   return kErrorExitCode;
 }
 
 
 static void ShutdownIsolate(void* callback_data) {
   IsolateData* isolate_data = reinterpret_cast<IsolateData*>(callback_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);
   CommandLineOptions dart_options(argc);
   bool print_flags_seen = false;
 
   // Perform platform specific initialization.
   if (!Platform::Initialize()) {
-    fprintf(stderr, "Initialization failed\n");
+    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,
@@ skipping 36 matching lines @@
   }
 
   // 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)) {
-    fprintf(stderr, "%s\n", error);
+    Log::PrintErr("%s\n", error);
     free(error);
     delete [] isolate_name;
     return kErrorExitCode;  // Indicates we encountered an error.
   }
   delete [] isolate_name;
 
   Dart_Isolate isolate = Dart_CurrentIsolate();
   ASSERT(isolate != NULL);
   Dart_Handle result;
 
@@ skipping 46 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 0;
 }