Refactor Isolate name format, storage and log

runtime/vm/service.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/service.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/globals.h"
 
@@ skipping 896 matching lines @@
                         const char* event_type,
                         uint8_t* bytes,
                         intptr_t bytes_length) {
   Thread* thread = Thread::Current();
   Isolate* isolate = thread->isolate();
   ASSERT(isolate != NULL);
   ASSERT(!ServiceIsolate::IsServiceIsolateDescendant(isolate));
 
   if (FLAG_trace_service) {
     OS::PrintErr(
-        "vm-service: Pushing ServiceEvent(isolate='%s', kind='%s',"
+        "vm-service: Pushing ServiceEvent(isolate='%s', "
+        "isolateId='" ISOLATE_SERVICE_ID_FORMAT_STRING
+        "', kind='%s',"
         " len=%" Pd ") to stream %s\n",
-        isolate->name(), event_type, bytes_length, stream_id);
+        isolate->name(), static_cast<int64_t>(isolate->main_port()), event_type,
+        bytes_length, stream_id);
   }
 
   bool result;
   {
     TransitionVMToNative transition(thread);
     Dart_CObject cbytes;
     cbytes.type = Dart_CObject_kExternalTypedData;
     cbytes.value.as_external_typed_data.type = Dart_TypedData_kUint8;
     cbytes.value.as_external_typed_data.length = bytes_length;
     cbytes.value.as_external_typed_data.data = bytes;
@@ skipping 45 matching lines @@
 
   // Data.
   memmove(&message[offset], data, data_size);
   offset += data_size;
 
   ASSERT(offset == total_bytes);
   SendEvent(stream_id, event_type, message, total_bytes);
 }
 
 static void ReportPauseOnConsole(ServiceEvent* event) {
-  const char* name = event->isolate()->debugger_name();
+  const char* name = event->isolate()->name();
+  const int64_t main_port = static_cast<int64_t>(event->isolate()->main_port());
   switch (event->kind()) {
     case ServiceEvent::kPauseStart:
-      OS::PrintErr(
-          "vm-service: isolate '%s' has no debugger attached and is paused at "
-          "start.",
-          name);
+      OS::PrintErr("vm-service: isolate(%" Pd64
+                   ") '%s' has no debugger attached and is paused at start.",
+                   main_port, name);
       break;
     case ServiceEvent::kPauseExit:
-      OS::PrintErr(
-          "vm-service: isolate '%s' has no debugger attached and is paused at "
-          "exit.",
-          name);
+      OS::PrintErr("vm-service: isolate(%" Pd64
+                   ")  '%s' has no debugger attached and is paused at exit.",
+                   main_port, name);
       break;
     case ServiceEvent::kPauseException:
       OS::PrintErr(
-          "vm-service: isolate '%s' has no debugger attached and is paused due "
-          "to exception.",
-          name);
+          "vm-service: isolate (%" Pd64
+          ") '%s' has no debugger attached and is paused due to exception.",
+          main_port, name);
       break;
     case ServiceEvent::kPauseInterrupted:
       OS::PrintErr(
-          "vm-service: isolate '%s' has no debugger attached and is paused due "
-          "to interrupt.",
-          name);
+          "vm-service: isolate (%" Pd64
+          ") '%s' has no debugger attached and is paused due to interrupt.",
+          main_port, name);
       break;
     case ServiceEvent::kPauseBreakpoint:
-      OS::PrintErr(
-          "vm-service: isolate '%s' has no debugger attached and is paused.",
-          name);
+      OS::PrintErr("vm-service: isolate (%" Pd64
+                   ") '%s' has no debugger attached and is paused.",
+                   main_port, name);
       break;
     case ServiceEvent::kPausePostRequest:
-      OS::PrintErr(
-          "vm-service: isolate '%s' has no debugger attached and is paused "
-          "post reload.",
-          name);
+      OS::PrintErr("vm-service: isolate (%" Pd64
+                   ") '%s' has no debugger attached and is paused post reload.",
+                   main_port, name);
       break;
     default:
       UNREACHABLE();
       break;
   }
   if (!ServiceIsolate::IsRunning()) {
     OS::PrintErr("  Start the vm-service to debug.\n");
   } else if (ServiceIsolate::server_address() == NULL) {
     OS::PrintErr("  Connect to Observatory to debug.\n");
   } else {
@@ skipping 56 matching lines @@
   stream_id_cobj.type = Dart_CObject_kString;
   stream_id_cobj.value.as_string = const_cast<char*>(stream_id);
   list_values[0] = &stream_id_cobj;
 
   Dart_CObject json_cobj;
   json_cobj.type = Dart_CObject_kString;
   json_cobj.value.as_string = const_cast<char*>(event->ToCString());
   list_values[1] = &json_cobj;
 
   if (FLAG_trace_service) {
-    const char* isolate_name = "<no current isolate>";
     if (isolate != NULL) {
-      isolate_name = isolate->name();
+      OS::PrintErr(
+          "vm-service: Pushing ServiceEvent(isolate='%s', "
+          "isolateId='" ISOLATE_SERVICE_ID_FORMAT_STRING
+          "', kind='%s') to stream %s\n",
+          isolate->name(), static_cast<int64_t>(isolate->main_port()), kind,
+          stream_id);
+    } else {
+      OS::PrintErr(
+          "vm-service: Pushing ServiceEvent(isolate='<no current isolate>', "
+          "kind='%s') to stream %s\n",
+          kind, stream_id);
     }
-    OS::PrintErr(
-        "vm-service: Pushing ServiceEvent(isolate='%s', kind='%s') "
-        "to stream %s\n",
-        isolate_name, kind, stream_id);
   }
 
   Dart_PostCObject(ServiceIsolate::Port(), &list_cobj);
 }
 
 class EmbedderServiceHandler {
  public:
   explicit EmbedderServiceHandler(const char* name)
       : name_(NULL), callback_(NULL), user_data_(NULL), next_(NULL) {
     ASSERT(name != NULL);
@@ skipping 2896 matching lines @@
   PrintInvalidParamError(js, "libraryId");
   return true;
 }
 
 static const MethodParameter* set_name_params[] = {
     ISOLATE_PARAMETER, new MethodParameter("name", true), NULL,
 };
 
 static bool SetName(Thread* thread, JSONStream* js) {
   Isolate* isolate = thread->isolate();
-  isolate->set_debugger_name(js->LookupParam("name"));
+  isolate->set_name(js->LookupParam("name"));
   if (Service::isolate_stream.enabled()) {
     ServiceEvent event(isolate, ServiceEvent::kIsolateUpdate);
     Service::HandleEvent(&event);
   }
   PrintSuccess(js);
   return true;
 }
 
 static const MethodParameter* set_vm_name_params[] = {
     NO_ISOLATE_PARAMETER, new MethodParameter("name", true), NULL,
@@ skipping 168 matching lines @@
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart