Service isolate rework

runtime/include/dart_api.h

Index: runtime/include/dart_api.h
diff --git a/runtime/include/dart_api.h b/runtime/include/dart_api.h
index d56241d32cccf1a1a4c682a05ca4e4a13adcd10d..9cba6f9764ae327093513c37b747249c4ff0b6e9 100755
--- a/runtime/include/dart_api.h
+++ b/runtime/include/dart_api.h
@@ -733,34 +733,6 @@ typedef Dart_Isolate (*Dart_IsolateCreateCallback)(const char* script_uri,
                                                    void* callback_data,
                                                    char** error);
 
-
-/**
- * The service isolate creation and initialization callback function.
- *
- * This callback, provided by the embedder, is called when the vm
- * needs to create the service isolate. The callback should create an isolate
- * by calling Dart_CreateIsolate and prepare the isolate to be used as
- * the service isolate.
- *
- * When the function returns NULL, it is the responsibility of this
- * function to ensure that Dart_ShutdownIsolate has been called if
- * required.
- *
- * When the function returns NULL, the function should set *error to
- * a malloc-allocated buffer containing a useful error message.  The
- * caller of this function (the vm) will make sure that the buffer is
- * freed.
- *
- *
- * \param error A structure into which the embedder can place a
- *   C string containing an error message in the case of failures.
- *
- * \return The embedder returns NULL if the creation and
- *   initialization was not successful and the isolate if successful.
- */
-typedef Dart_Isolate (*Dart_ServiceIsolateCreateCalback)(void* callback_data,
-                                                         char** error);
-
 /**
  * An isolate interrupt callback function.
  *
@@ -869,8 +841,7 @@ DART_EXPORT bool Dart_Initialize(
     Dart_FileReadCallback file_read,
     Dart_FileWriteCallback file_write,
     Dart_FileCloseCallback file_close,
-    Dart_EntropySource entropy_source,
-    Dart_ServiceIsolateCreateCalback service_create);
+    Dart_EntropySource entropy_source);
 
 /**
  * Cleanup state in the VM before process termination.
@@ -2741,38 +2712,6 @@ DART_EXPORT Dart_Handle Dart_GetPeer(Dart_Handle object, void** peer);
  */
 DART_EXPORT Dart_Handle Dart_SetPeer(Dart_Handle object, void* peer);
 
-
-/*
- * =======
- * Service
- * =======
- */
-
-/**
- * Returns the Service isolate initialized and with the dart:vmservice library
- * loaded and booted.
- *
- * This will call the embedder provided Dart_ServiceIsolateCreateCalback to
- * create the isolate.
- *
- * After obtaining the service isolate the embedder specific glue code can
- * be loaded in and the isolate can be run by the embedder.
- *
- * NOTE: It is not safe to call this from multiple threads concurrently.
- *
- * \return Returns NULL if an error occurred.
- */
-DART_EXPORT Dart_Isolate Dart_GetServiceIsolate(void* callback_data);
-
-
-/**
- * Returns true if the service is enabled. False otherwise.
- *
- *  \return Returns true if service is running.
- */
-DART_EXPORT bool Dart_IsServiceRunning();
-
-
 /**
  * A service request callback function.
  *
@@ -2805,6 +2744,12 @@ typedef const char* (*Dart_ServiceRequestCallback)(
     intptr_t num_options,
     void* user_data);
 
+/*
+ * =======
+ * Service
+ * =======
+ */
+
 /**
  * Register a Dart_ServiceRequestCallback to be called to handle requests
  * with name on a specific isolate. The callback will be invoked with the