Refactor Isolate name format, storage and log

runtime/vm/json_stream.cc

Index: runtime/vm/json_stream.cc
diff --git a/runtime/vm/json_stream.cc b/runtime/vm/json_stream.cc
index 4c229c9f368d664885e36fcf46e933faa4f893c9..a92c430766978a5a35305f7707ef333340b42041 100644
--- a/runtime/vm/json_stream.cc
+++ b/runtime/vm/json_stream.cc
@@ -122,10 +122,13 @@ void JSONStream::Setup(Zone* zone,
   if (FLAG_trace_service) {
     Isolate* isolate = Isolate::Current();
     ASSERT(isolate != NULL);
+    int64_t main_port = static_cast<int64_t>(isolate->main_port());
     const char* isolate_name = isolate->name();
     setup_time_micros_ = OS::GetCurrentTimeMicros();
-    OS::PrintErr("[+%" Pd64 "ms] Isolate %s processing service request %s\n",
-                 Dart::UptimeMillis(), isolate_name, method_);
+    OS::PrintErr("[+%" Pd64 "ms] Isolate (%" Pd64
+                 ") %s processing service "
+                 "request %s\n",
+                 Dart::UptimeMillis(), main_port, isolate_name, method_);
   }
   buffer_.Printf("{\"jsonrpc\":\"2.0\", \"result\":");
 }
@@ -279,18 +282,19 @@ void JSONStream::PostReply() {
   if (FLAG_trace_service) {
     Isolate* isolate = Isolate::Current();
     ASSERT(isolate != NULL);
+    int64_t main_port = static_cast<int64_t>(isolate->main_port());
     const char* isolate_name = isolate->name();
     int64_t total_time = OS::GetCurrentTimeMicros() - setup_time_micros_;
     if (result) {
-      OS::PrintErr("[+%" Pd64
-                   "ms] Isolate %s processed service request %s "
-                   "(%" Pd64 "us)\n",
-                   Dart::UptimeMillis(), isolate_name, method_, total_time);
+      OS::PrintErr("[+%" Pd64 "ms] Isolate (%" Pd64
+                   ") %s processed service request %s (%" Pd64 "us)\n",
+                   Dart::UptimeMillis(), main_port, isolate_name, method_,
+                   total_time);
     } else {
-      OS::PrintErr("[+%" Pd64
-                   "ms] Isolate %s processed service request %s "
-                   "(%" Pd64 "us) FAILED\n",
-                   Dart::UptimeMillis(), isolate_name, method_, total_time);
+      OS::PrintErr("[+%" Pd64 "ms] Isolate (%" Pd64
+                   ") %s processed service request %s (%" Pd64 "us) FAILED\n",
+                   Dart::UptimeMillis(), main_port, isolate_name, method_,
+                   total_time);
     }
   }
 }