Refactor Isolate name format, storage and log

runtime/vm/compiler_stats.cc

 // Copyright (c) 2011, 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/compiler_stats.h"
 
 #include "vm/flags.h"
 #include "vm/log.h"
 #include "vm/object_graph.h"
 #include "vm/object_store.h"
@@ skipping 125 matching lines @@
   FLAG_compiler_stats = true;
   use_benchmark_output = true;
 }
 
 // Generate output for Golem benchmark harness. If the output format
 // changes, the parsing function in Golem must be updated.
 char* CompilerStats::BenchmarkOutput() {
   Update();
   Log log(PrintToStats);
   LogBlock lb(Thread::Current(), &log);
-  log.Print("==== Compiler Stats for isolate '%s' ====\n",
-            isolate_->debugger_name());
+  log.Print("==== Compiler Stats for isolate (%" Pd64 ") '%s' ====\n",
+            static_cast<int64_t>(isolate_->main_port()), isolate_->name());
 
   log.Print("NumberOfTokens: %" Pd64 "\n", num_tokens_total);
   log.Print("NumClassesParsed: %" Pd64 "\n", num_classes_parsed);
   log.Print("NumFunctionsCompiled: %" Pd64 "\n", num_functions_compiled);
   log.Print("NumFunctionsOptimized: %" Pd64 "\n", num_functions_optimized);
   log.Print("NumFunctionsParsed: %" Pd64 "\n", num_functions_parsed);
 
   // Scanner stats.
   int64_t scan_usecs = scanner_timer.TotalElapsedTime();
   int64_t scan_speed =
@@ skipping 38 matching lines @@
     return NULL;
   } else if (use_benchmark_output) {
     return BenchmarkOutput();
   }
 
   Update();
 
   Log log(PrintToStats);
   LogBlock lb(Thread::Current(), &log);
 
-  log.Print("==== Compiler Stats for isolate '%s' ====\n",
-            isolate_->debugger_name());
+  log.Print("==== Compiler Stats for isolate  (%" Pd64 ") '%s' ====\n",
+            static_cast<int64_t>(isolate_->main_port()), isolate_->name());
   log.Print("Number of tokens:        %" Pd64 "\n", num_tokens_total);
   log.Print("Source length:           %" Pd64 " characters\n", src_length);
   log.Print("Number of source tokens: %" Pd64 "\n", num_tokens_scanned);
 
   int64_t num_local_functions =
       GrowableObjectArray::Handle(isolate_->object_store()->closure_functions())
           .Length();
 
   log.Print("==== Parser stats:\n");
   log.Print("Total tokens consumed:   %" Pd64 "\n", num_tokens_consumed);
@@ skipping 81 matching lines @@
   log.Print("  VarDesc size:          %" Pd64 " KB\n", vardesc_size / 1024);
   log.Flush();
   char* stats_text = text;
   text = NULL;
   return stats_text;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart