Index: runtime/vm/service.h |
diff --git a/runtime/vm/service.h b/runtime/vm/service.h |
index 2af9b2dfaa951e71dcf28a4b37674b80ca1b53d4..2a9078f3bff9905c2ffa9a4afb42d3667c133b4b 100644 |
--- a/runtime/vm/service.h |
+++ b/runtime/vm/service.h |
@@ -25,39 +25,16 @@ class String; |
class Service : public AllStatic { |
public: |
- static const char* kIsolateName; |
- static bool IsServiceIsolateName(const char* name); |
- |
// Handles a message which is not directed to an isolate. |
- static void HandleRootMessage(const Instance& message); |
+ static void HandleRootMessage(const Array& message); |
// Handles a message which is directed to a particular isolate. |
static void HandleIsolateMessage(Isolate* isolate, const Array& message); |
- static Isolate* GetServiceIsolate(void* callback_data); |
- static bool SendIsolateStartupMessage(); |
- static bool SendIsolateShutdownMessage(); |
- |
- static bool IsRunning(); |
- static void SetServicePort(Dart_Port port); |
- static void SetServiceIsolate(Isolate* isolate); |
- static bool HasServiceIsolate(); |
- static bool IsServiceIsolate(Isolate* isolate); |
- |
- static Dart_Port WaitForLoadPort(); |
- static Dart_Port LoadPort(); |
- static void SetLoadPort(Dart_Port port); |
- |
+ static bool EventMaskHas(uint32_t mask); |
static void SetEventMask(uint32_t mask); |
- |
- // Is the service interested in debugger events? |
- static bool NeedsDebuggerEvents() { |
- return IsRunning() && ((event_mask_ & kEventFamilyDebugMask) != 0); |
- } |
- // Is the service interested in garbage collection events? |
- static bool NeedsGCEvents() { |
- return IsRunning() && ((event_mask_ & kEventFamilyGCMask) != 0); |
- } |
+ static bool NeedsDebuggerEvents(); |
+ static bool NeedsGCEvents(); |
static void HandleDebuggerEvent(DebuggerEvent* event); |
static void HandleGCEvent(GCEvent* event); |
@@ -75,17 +52,9 @@ class Service : public AllStatic { |
static void SendEchoEvent(Isolate* isolate, const char* text); |
static void SendGraphEvent(Isolate* isolate); |
- static void MaybeInjectVMServiceLibrary(Isolate* isolate); |
- |
- static void RunService(); |
- |
- static void FinishedInitializing(); |
- |
- static Dart_IsolateCreateCallback create_callback() { |
- return create_callback_; |
- } |
- |
private: |
+ static void InvokeMethod(Isolate* isolate, const Array& message); |
+ |
// These must be kept in sync with service/constants.dart |
static const int kEventFamilyDebug = 0; |
static const int kEventFamilyGC = 1; |
@@ -97,9 +66,6 @@ class Service : public AllStatic { |
static EmbedderServiceHandler* FindIsolateEmbedderHandler(const char* name); |
static EmbedderServiceHandler* FindRootEmbedderHandler(const char* name); |
- static Dart_Handle GetSource(const char* name); |
- static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag, Dart_Handle library, |
- Dart_Handle url); |
static void SendEvent(intptr_t eventId, const Object& eventMessage); |
// Does not take ownership of 'data'. |
@@ -111,13 +77,6 @@ class Service : public AllStatic { |
static EmbedderServiceHandler* isolate_service_handler_head_; |
static EmbedderServiceHandler* root_service_handler_head_; |
- |
- static Dart_IsolateCreateCallback create_callback_; |
- static Monitor* monitor_; |
- static bool initializing_; |
- static Isolate* service_isolate_; |
- static Dart_Port service_port_; |
- static Dart_Port load_port_; |
static uint32_t event_mask_; |
}; |