Refactor Isolate name format, storage and log

runtime/vm/json_stream.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 "platform/assert.h"
 
 #include "include/dart_native_api.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
@@ skipping 104 matching lines @@
       string_iterator ^= param_values.At(i);
       param_values_native[i] =
           zone->MakeCopyOfString(string_iterator.ToCString());
     }
     SetParams(param_keys_native, param_values_native, param_keys.Length());
   }
 
   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\":");
 }
 
 void JSONStream::SetupError() {
   buffer_.Clear();
   buffer_.Printf("{\"jsonrpc\":\"2.0\", \"error\":");
 }
 
 static const char* GetJSONRpcErrorMessage(intptr_t code) {
@@ skipping 133 matching lines @@
     result = Dart_PostCObject(port, &message);
   }
 
   if (!result) {
     free(cstr);
   }
 
   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);
     }
   }
 }
 
 const char* JSONStream::LookupParam(const char* key) const {
   for (int i = 0; i < num_params(); i++) {
     if (!strcmp(key, param_keys_[i])) {
       return param_values_[i];
     }
   }
@@ skipping 646 matching lines @@
   va_end(args);
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p, len);
   stream_->buffer_.AddChar('"');
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart