Refactor Isolate name format, storage and log

runtime/vm/isolate.cc

 // Copyright (c) 2013, 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/isolate.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
 #include "platform/text_buffer.h"
@@ skipping 739 matching lines @@
       current_tag_(UserTag::null()),
       default_tag_(UserTag::null()),
       ic_miss_code_(Code::null()),
       object_store_(NULL),
       class_table_(),
       single_step_(false),
       isolate_flags_(0),
       background_compiler_disabled_depth_(0),
       background_compiler_(NULL),
 #if !defined(PRODUCT)
-      debugger_name_(NULL),
       debugger_(NULL),
       last_resume_timestamp_(OS::GetCurrentTimeMillis()),
       last_allocationprofile_accumulator_reset_timestamp_(0),
       last_allocationprofile_gc_timestamp_(0),
       vm_tag_counters_(),
       pending_service_extension_calls_(GrowableObjectArray::null()),
       registered_service_extension_handlers_(GrowableObjectArray::null()),
       metrics_list_head_(NULL),
       pause_loop_monitor_(NULL),
 #define ISOLATE_METRIC_CONSTRUCTORS(type, variable, name, unit)                \
@@ skipping 50 matching lines @@
   // how the vm_tag (kEmbedderTagId) can be set, these tags need to
   // move to the OSThread structure.
   set_user_tag(UserTags::kDefaultUserTag);
 }
 
 #undef REUSABLE_HANDLE_SCOPE_INIT
 #undef REUSABLE_HANDLE_INITIALIZERS
 
 Isolate::~Isolate() {
 #if !defined(PRODUCT)
-  free(debugger_name_);
   delete debugger_;
   if (FLAG_support_service) {
     delete object_id_ring_;
   }
   object_id_ring_ = NULL;
   delete pause_loop_monitor_;
   pause_loop_monitor_ = NULL;
 #endif  // !defined(PRODUCT)
 
   free(name_);
@@ skipping 130 matching lines @@
 void Isolate::ScheduleMessageInterrupts() {
   // We take the threads lock here to ensure that the mutator thread does not
   // exit the isolate while we are trying to schedule interrupts on it.
   MonitorLocker ml(threads_lock());
   Thread* mthread = mutator_thread();
   if (mthread != NULL) {
     mthread->ScheduleInterrupts(Thread::kMessageInterrupt);
   }
 }
 
-#if !defined(PRODUCT)
-void Isolate::set_debugger_name(const char* name) {
-  free(debugger_name_);
-  debugger_name_ = strdup(name);
+void Isolate::set_name(const char* name) {
+  free(name_);
+  name_ = strdup(name);
 }
-#endif  // !defined(PRODUCT)
 
 int64_t Isolate::UptimeMicros() const {
   return OS::GetCurrentMonotonicMicros() - start_time_micros_;
 }
 
 bool Isolate::IsPaused() const {
 #if defined(PRODUCT)
   return false;
 #else
   return (debugger_ != NULL) && (debugger_->PauseEvent() != NULL);
@@ skipping 15 matching lines @@
       UNREACHABLE();
     }
   }
 #endif
   return Error::null();
 }
 
 void Isolate::BuildName(const char* name_prefix) {
   ASSERT(name_ == NULL);
   if (name_prefix == NULL) {
-    name_prefix = "isolate";
+    name_ = OS::SCreate(NULL, "isolate-%" Pd64 "", main_port());
+  } else {
+    name_ = strdup(name_prefix);
   }
-  NOT_IN_PRODUCT(set_debugger_name(name_prefix));
-  if (ServiceIsolate::NameEquals(name_prefix)) {
-    name_ = strdup(name_prefix);
-    return;
-  }
-  name_ = OS::SCreate(NULL, "%s-%" Pd64 "", name_prefix, main_port());
 }
 
 void Isolate::DoneLoading() {
   GrowableObjectArray& libs =
       GrowableObjectArray::Handle(current_zone(), object_store()->libraries());
   Library& lib = Library::Handle(current_zone());
   intptr_t num_libs = libs.Length();
   for (intptr_t i = 0; i < num_libs; i++) {
     lib ^= libs.At(i);
     // If this library was loaded with Dart_LoadLibrary, it was marked
@@ skipping 856 matching lines @@
 
 void Isolate::PrintJSON(JSONStream* stream, bool ref) {
   if (!FLAG_support_service) {
     return;
   }
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", (ref ? "@Isolate" : "Isolate"));
   jsobj.AddFixedServiceId(ISOLATE_SERVICE_ID_FORMAT_STRING,
                           static_cast<int64_t>(main_port()));
 
-  jsobj.AddProperty("name", debugger_name());
+  jsobj.AddProperty("name", name());
   jsobj.AddPropertyF("number", "%" Pd64 "", static_cast<int64_t>(main_port()));
   if (ref) {
     return;
   }
   jsobj.AddPropertyF("_originNumber", "%" Pd64 "",
                      static_cast<int64_t>(origin_id()));
   int64_t uptime_millis = UptimeMicros() / kMicrosecondsPerMillisecond;
   int64_t start_time = OS::GetCurrentTimeMillis() - uptime_millis;
   jsobj.AddPropertyTimeMillis("startTime", start_time);
   {
@@ skipping 912 matching lines @@
 void IsolateSpawnState::DecrementSpawnCount() {
   ASSERT(spawn_count_monitor_ != NULL);
   ASSERT(spawn_count_ != NULL);
   MonitorLocker ml(spawn_count_monitor_);
   ASSERT(*spawn_count_ > 0);
   *spawn_count_ = *spawn_count_ - 1;
   ml.Notify();
 }
 
 }  // namespace dart