Allow for embedder provided service request handlers

runtime/bin/vmservice_impl.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 "bin/vmservice_impl.h"
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/isolate_data.h"
+#include "bin/platform.h"
 #include "bin/thread.h"
+#include "platform/json.h"
 
 namespace dart {
 namespace bin {
 
 #define RETURN_ERROR_HANDLE(handle)                             \
   if (Dart_IsError(handle)) {                                   \
     return handle;                                              \
   }
 
 #define SHUTDOWN_ON_ERROR(handle)                               \
@@ skipping 56 matching lines @@
   static ResourcesEntry* ResourcesTable() {
     return &__service_bin_resources_[0];
   }
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(Resources);
 };
 
 const char* VmService::error_msg_ = NULL;
 
+static void* embedder_request_callback_user_data = reinterpret_cast<void*>(0x3);
+
+static const char* embedder_request_callback(const char* name,
+                                             const char** arguments,
+                                             intptr_t num_arguments,
+                                             const char** option_keys,
+                                             const char** option_values,
+                                             intptr_t num_options,
+                                             void* user_data) {
+  ASSERT(user_data == embedder_request_callback_user_data);
+  TextBuffer tb(256);
+  tb.AddString("{\"type\": \"Embedder\",\"value\":\"Standalone\"}");

[turnidge, 2014/02/18 22:25:12]

Shouldn't this be a root-level request?

[Cutch, 2014/02/18 22:34:10]

I'm dropping these for now.

+  return tb.Steal();
+}
+
+
+static const char* embedder_os_callback(const char* name,
+                                        const char** arguments,
+                                        intptr_t num_arguments,
+                                        const char** option_keys,
+                                        const char** option_values,
+                                        intptr_t num_options,
+                                        void* user_data) {
+  TextBuffer tb(256);
+  tb.AddString("{\"type\": \"OS\", \"value\":\"");
+  tb.AddString(Platform::OperatingSystem());
+  tb.AddString("\"}");
+  return tb.Steal();
+}
+
+
 bool VmService::Start(intptr_t server_port) {
   bool r = _Start(server_port);
   if (!r) {
     return r;
   }
+  // Register an embedder provided isolate request callback.
+  Dart_RegisterIsolateServiceRequestCallback(
+      "_embedder",
+      embedder_request_callback,
+      embedder_request_callback_user_data);
+  Dart_RegisterRootServiceRequestCallback("_os", embedder_os_callback, NULL);
   // Start processing messages in a new thread.
   dart::Thread::Start(ThreadMain, NULL);
   return true;
 }
 
 
 bool VmService::_Start(intptr_t server_port) {
   ASSERT(Dart_CurrentIsolate() == NULL);
   Dart_Isolate isolate = Dart_GetServiceIsolate(NULL);
   if (isolate == NULL) {
@@ skipping 170 matching lines @@
     printf("Service exited with an error:\n%s\n", Dart_GetError(result));
   }
   Dart_ExitScope();
   Dart_ExitIsolate();
 }
 
 
 
 }  // namespace bin
 }  // namespace dart