Allow Observatory debugger to switch isolates.

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 "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 511 matching lines @@
 
 
 void Service::SetEventMask(uint32_t mask) {
   event_mask_ = mask;
 }
 
 
 void Service::SendEvent(intptr_t eventFamilyId,
                         intptr_t eventType,
                         const Object& eventMessage) {
+  ASSERT(!ServiceIsolate::IsServiceIsolate(Isolate::Current()));
   if (!ServiceIsolate::IsRunning()) {
     return;
   }
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   HANDLESCOPE(isolate);
 
   // Construct a list of the form [eventFamilyId, eventMessage].
   //
   // TODO(turnidge): Revisit passing the eventFamilyId here at all.
@@ skipping 42 matching lines @@
     memmove(message.DataAddr(offset), data, size);
     offset += size;
   }
   ASSERT(offset == total_bytes);
   // TODO(turnidge): Pass the real eventType here.
   SendEvent(eventFamilyId, 0, message);
 }
 
 
 void Service::HandleGCEvent(GCEvent* event) {
+  if (ServiceIsolate::IsServiceIsolate(Isolate::Current())) {
+    return;
+  }
   JSONStream js;
   event->PrintJSON(&js);
   const String& message = String::Handle(String::New(js.ToCString()));
   // TODO(turnidge): Pass the real eventType here.
   SendEvent(kEventFamilyGC, 0, message);
 }
 
 
 void Service::HandleEvent(ServiceEvent* event) {
   JSONStream js;
@@ skipping 1846 matching lines @@
 };
 
 
 static bool GetVM(Isolate* isolate, JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "VM");
   jsobj.AddProperty("id", "vm");
   jsobj.AddProperty("architectureBits", static_cast<intptr_t>(kBitsPerWord));
   jsobj.AddProperty("targetCPU", CPU::Id());
   jsobj.AddProperty("hostCPU", HostCPUFeatures::hardware());
-  jsobj.AddPropertyF("date", "%" Pd64 "", OS::GetCurrentTimeMillis());
   jsobj.AddProperty("version", Version::String());
   // Send pid as a string because it allows us to avoid any issues with
   // pids > 53-bits (when consumed by JavaScript).
   // TODO(johnmccutchan): Codify how integers are sent across the service.
   jsobj.AddPropertyF("pid", "%" Pd "", OS::ProcessId());
   jsobj.AddProperty("assertsEnabled", isolate->AssertsEnabled());
   jsobj.AddProperty("typeChecksEnabled", isolate->TypeChecksEnabled());
-  int64_t start_time_micros = Dart::vm_isolate()->start_time();
-  int64_t uptime_micros = (OS::GetCurrentTimeMicros() - start_time_micros);
-  double seconds = (static_cast<double>(uptime_micros) /
-                    static_cast<double>(kMicrosecondsPerSecond));
-  jsobj.AddProperty("uptime", seconds);
-
+  int64_t start_time_millis = (Dart::vm_isolate()->start_time() /
+                               kMicrosecondsPerMillisecond);
+  jsobj.AddProperty64("refreshTime", OS::GetCurrentTimeMillis());
+  jsobj.AddProperty64("startTime", start_time_millis);
   // Construct the isolate list.
   {
     JSONArray jsarr(&jsobj, "isolates");
     ServiceIsolateVisitor visitor(&jsarr);
     Isolate::VisitIsolates(&visitor);
   }
   return true;
 }
 
 
@@ skipping 34 matching lines @@
     return true;
   } else {
     jsobj.AddProperty("type", "Failure");
     jsobj.AddProperty("id", "");
     jsobj.AddProperty("message", error);
     return true;
   }
 }
 
 
+static const MethodParameter* set_name_params[] = {
+  ISOLATE_PARAMETER,
+  new MethodParameter("name", true),
+  NULL,
+};
+
+
+static bool SetName(Isolate* isolate, JSONStream* js) {
+  // TODO(turnidge): Do we want to send some sort of isolate update event?

[Cutch, 2015/03/18 20:05:48]

dead TODO.

[turnidge, 2015/03/26 17:46:58]

Done.

+  isolate->set_debugger_name(js->LookupParam("name"));
+  {
+    ServiceEvent event(isolate, ServiceEvent::kIsolateUpdate);
+    Service::HandleEvent(&event);
+  }
+  JSONObject jsobj(js);
+  jsobj.AddProperty("type", "Success");
+  return true;
+}
+
+
 static ServiceMethodDescriptor service_methods_[] = {
   { "_echo", _Echo,
     NULL },
   { "_respondWithMalformedJson", _RespondWithMalformedJson,
     NULL },
   { "_respondWithMalformedObject", _RespondWithMalformedObject,
     NULL },
   { "_triggerEchoEvent", _TriggerEchoEvent,
     NULL },
   { "addBreakpoint", AddBreakpoint,
@@ skipping 51 matching lines @@
   { "getVMMetricList", GetVMMetricList,
     get_vm_metric_list_params },
   { "pause", Pause,
     pause_params },
   { "removeBreakpoint", RemoveBreakpoint,
     remove_breakpoint_params },
   { "resume", Resume,
     resume_params },
   { "requestHeapSnapshot", RequestHeapSnapshot,
     request_heap_snapshot_params },
-  { "setFlag", SetFlag ,
+  { "setFlag", SetFlag,
     set_flags_params },
+  { "setName", SetName,
+    set_name_params },
 };
 
 
 ServiceMethodDescriptor* FindMethod(const char* method_name) {
   intptr_t num_methods = sizeof(service_methods_) /
                          sizeof(service_methods_[0]);
   for (intptr_t i = 0; i < num_methods; i++) {
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart