Major rework of vm service events.

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"
 #include "vm/coverage.h"
 #include "vm/cpu.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/message.h"
 #include "vm/message_handler.h"
 #include "vm/native_entry.h"
 #include "vm/native_arguments.h"
 #include "vm/object.h"
 #include "vm/object_graph.h"
 #include "vm/object_id_ring.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/port.h"
 #include "vm/profiler_service.h"
 #include "vm/reusable_handles.h"
+#include "vm/service_event.h"
 #include "vm/service_isolate.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 #include "vm/unicode.h"
 #include "vm/version.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, trace_service);
 DECLARE_FLAG(bool, trace_service_pause_events);
@@ skipping 454 matching lines @@
   ASSERT(isolate != NULL);
   InvokeMethod(isolate, msg);
 }
 
 
 bool Service::EventMaskHas(uint32_t mask) {
   return (event_mask_ & mask) != 0;
 }
 
 
+bool Service::NeedsEvents() {
+  return ServiceIsolate::IsRunning();
+}
+
+
 bool Service::NeedsDebuggerEvents() {
-  return ServiceIsolate::IsRunning() && EventMaskHas(kEventFamilyDebugMask);
+  return NeedsEvents() && EventMaskHas(kEventFamilyDebugMask);
 }
 
 
 bool Service::NeedsGCEvents() {
-  return ServiceIsolate::IsRunning() && EventMaskHas(kEventFamilyGCMask);
+  return NeedsEvents() && EventMaskHas(kEventFamilyGCMask);
 }
 
 
 void Service::SetEventMask(uint32_t mask) {
   event_mask_ = mask;
 }
 
 
 void Service::SendEvent(intptr_t eventId, const Object& eventMessage) {
   if (!ServiceIsolate::IsRunning()) {
@@ skipping 55 matching lines @@
 
 
 void Service::HandleGCEvent(GCEvent* event) {
   JSONStream js;
   event->PrintJSON(&js);
   const String& message = String::Handle(String::New(js.ToCString()));
   SendEvent(kEventFamilyGC, message);
 }
 
 
-void Service::HandleDebuggerEvent(DebuggerEvent* event) {
+void Service::HandleEvent(ServiceEvent* event) {
   JSONStream js;
   event->PrintJSON(&js);
   const String& message = String::Handle(String::New(js.ToCString()));
   SendEvent(kEventFamilyDebug, message);
 }
 
 
 class EmbedderServiceHandler {
  public:
   explicit EmbedderServiceHandler(const char* name) : name_(NULL),
@@ skipping 1412 matching lines @@
 
 
 static bool Resume(Isolate* isolate, JSONStream* js) {
   const char* step_param = js->LookupParam("step");
   if (isolate->message_handler()->paused_on_start()) {
     isolate->message_handler()->set_pause_on_start(false);
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
     jsobj.AddProperty("id", "");
     {
-      DebuggerEvent resumeEvent(isolate, DebuggerEvent::kIsolateResumed);
-      Service::HandleDebuggerEvent(&resumeEvent);
+      ServiceEvent event(isolate, ServiceEvent::kResume);
+      Service::HandleEvent(&event);
     }
     return true;
   }
   if (isolate->message_handler()->paused_on_exit()) {
     isolate->message_handler()->set_pause_on_exit(false);
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
     jsobj.AddProperty("id", "");
     // We don't send a resume event because we will be exiting.
     return true;
@@ skipping 16 matching lines @@
     jsobj.AddProperty("type", "Success");
     jsobj.AddProperty("id", "");
     return true;
   }
 
   PrintError(js, "VM was not paused");
   return true;
 }
 
 
-static const MethodParameter* get_breakpoints_params[] = {
-  ISOLATE_PARAMETER,
-  NULL,
-};
-
-
-static bool GetBreakpoints(Isolate* isolate, JSONStream* js) {
-  JSONObject jsobj(js);
-  jsobj.AddProperty("type", "BreakpointList");
-  JSONArray jsarr(&jsobj, "breakpoints");
-  isolate->debugger()->PrintBreakpointsToJSONArray(&jsarr);
-  return true;
-}
-
-
 static const MethodParameter* pause_params[] = {
   ISOLATE_PARAMETER,
   NULL,
 };
 
 
 static bool Pause(Isolate* isolate, JSONStream* js) {
   // TODO(turnidge): Don't double-interrupt the isolate here.
   isolate->ScheduleInterrupts(Isolate::kApiInterrupt);
   JSONObject jsobj(js);
@@ skipping 428 matching lines @@
   { "addBreakpoint", AddBreakpoint,
     add_breakpoint_params },
   { "addBreakpointAtEntry", AddBreakpointAtEntry,
     add_breakpoint_at_entry_params },
   { "clearCpuProfile", ClearCpuProfile,
     clear_cpu_profile_params },
   { "eval", Eval,
     eval_params },
   { "getAllocationProfile", GetAllocationProfile,
     get_allocation_profile_params },
-  { "getBreakpoints", GetBreakpoints,
-    get_breakpoints_params },
   { "getCallSiteData", GetCallSiteData,
     get_call_site_data_params },
   { "getClassList", GetClassList,
     get_class_list_params },
   { "getCoverage", GetCoverage,
     get_coverage_params },
   { "getCpuProfile", GetCpuProfile,
     get_cpu_profile_params },
   { "getFlagList", GetFlagList ,
     get_flag_list_params },
@@ skipping 49 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart