Make service lifecycle checks thread safe

runtime/vm/service.h

 // 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.
 
 #ifndef VM_SERVICE_H_
 #define VM_SERVICE_H_
 
 #include "include/dart_api.h"
 
 #include "vm/allocation.h"
@@ skipping 20 matching lines @@
   // Handles a message which is not directed to an isolate.
   static void HandleRootMessage(const Instance& 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() {
-    return port_ != ILLEGAL_PORT;
-  }
-
-  static void set_port(Dart_Port port) {
-    port_ = port;
-  }
+  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 bool IsServicePort(Dart_Port port) {
-    return (port == port_) || (port == load_port_);
-  }
   static Dart_Port LoadPort();
-
   static void SetLoadPort(Dart_Port port);
 
   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 void HandleDebuggerEvent(DebuggerEvent* event);
   static void HandleGCEvent(GCEvent* event);
 
   static void RegisterIsolateEmbedderCallback(
       const char* name,
       Dart_ServiceRequestCallback callback,
       void* user_data);
 
   static void RegisterRootEmbedderCallback(
       const char* name,
       Dart_ServiceRequestCallback callback,
       void* user_data);
 
-  static bool IsServiceIsolate(Isolate* isolate) {
-    return isolate == service_isolate_;
-  }
-
   static void SendEchoEvent(Isolate* isolate);
   static void SendGraphEvent(Isolate* isolate);
 
   static void MaybeInjectVMServiceLibrary(Isolate* isolate);
 
   static void RunService();
 
   static void FinishedInitializing();
 
  private:
@@ skipping 15 matching lines @@
   static void SendEvent(intptr_t eventId, const Object& eventMessage);
   // Does not take ownership of 'data'.
   static void SendEvent(intptr_t eventId,
                         const String& meta,
                         const uint8_t* data,
                         intptr_t size);
 
   static EmbedderServiceHandler* isolate_service_handler_head_;
   static EmbedderServiceHandler* root_service_handler_head_;
 
-  static Isolate* service_isolate_;
-  static Dart_Port port_;
+
   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_;
 };
 
 }  // namespace dart
 
 #endif  // VM_SERVICE_H_