Service isolate requests Observatory assets from embedder

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 "include/dart_native_api.h"
 #include "platform/globals.h"
 
@@ skipping 85 matching lines @@
 // TODO(johnmccutchan): Unify embedder service handler lists and their APIs.
 EmbedderServiceHandler* Service::isolate_service_handler_head_ = NULL;
 EmbedderServiceHandler* Service::root_service_handler_head_ = NULL;
 struct ServiceMethodDescriptor;
 ServiceMethodDescriptor* FindMethod(const char* method_name);
 
 
 // Support for streams defined in embedders.
 Dart_ServiceStreamListenCallback Service::stream_listen_callback_ = NULL;
 Dart_ServiceStreamCancelCallback Service::stream_cancel_callback_ = NULL;
-
+Dart_GetVMServiceAssetsArchive Service::get_service_assets_callback_ = NULL;
 
 // These are the set of streams known to the core VM.
 StreamInfo Service::vm_stream("VM");
 StreamInfo Service::isolate_stream("Isolate");
 StreamInfo Service::debug_stream("Debug");
 StreamInfo Service::gc_stream("GC");
 StreamInfo Service::echo_stream("_Echo");
 StreamInfo Service::graph_stream("_Graph");
 StreamInfo Service::logging_stream("_Logging");
 
@@ skipping 20 matching lines @@
       streams_[i]->set_enabled(true);
       return true;
     }
   }
   if (stream_listen_callback_) {
     return (*stream_listen_callback_)(stream_id);
   }
   return false;
 }
 
+
 void Service::CancelStream(const char* stream_id) {
   if (FLAG_trace_service) {
     OS::Print("vm-service: stopping stream '%s'\n",
               stream_id);
   }
   intptr_t num_streams = sizeof(streams_) /
                          sizeof(streams_[0]);
   for (intptr_t i = 0; i < num_streams; i++) {
     if (strcmp(stream_id, streams_[i]->id()) == 0) {
       streams_[i]->set_enabled(false);
       return;
     }
   }
   if (stream_cancel_callback_) {
     return (*stream_cancel_callback_)(stream_id);
   }
 }
 
+RawObject* Service::RequestAssets() {
+  Thread* T = Thread::Current();
+  Api::Scope api_scope(T);
+  if (get_service_assets_callback_ == NULL) {
+    return Object::null();
+  }
+  Dart_Handle handle = get_service_assets_callback_();
+  if (Dart_IsError(handle)) {
+    Dart_PropagateError(handle);
+  }
+  const Object& object = Object::Handle(Api::UnwrapHandle(handle));
+  if (object.IsNull()) {
+    return Object::null();
+  }
+  if (!object.IsTypedData()) {
+    const String& error_message =
+        String::Handle(
+            String::New("An implementation of Dart_GetVMServiceAssetsArchive "
+                        "should return a Uint8Array or null."));
+    const Error& error = Error::Handle(ApiError::New(error_message));
+    Exceptions::PropagateError(error);
+    return Object::null();
+  }
+  const TypedData& typed_data = TypedData::Cast(object);
+  if (typed_data.ElementSizeInBytes() != 1) {
+    const String& error_message =
+        String::Handle(
+            String::New("An implementation of Dart_GetVMServiceAssetsArchive "
+                        "should return a Uint8Array or null."));
+    const Error& error = Error::Handle(ApiError::New(error_message));
+    Exceptions::PropagateError(error);
+    return Object::null();
+  }
+  return Api::UnwrapHandle(handle);
+}
+
+
 static uint8_t* allocator(uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   void* new_ptr = realloc(reinterpret_cast<void*>(ptr), new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
+
 static void PrintMissingParamError(JSONStream* js,
                                    const char* param) {
   js->PrintError(kInvalidParams,
                  "%s expects the '%s' parameter", js->method(), param);
 }
 
 
 static void PrintInvalidParamError(JSONStream* js,
                                    const char* param) {
   js->PrintError(kInvalidParams,
@@ skipping 738 matching lines @@
 
 
 void Service::SetEmbedderStreamCallbacks(
     Dart_ServiceStreamListenCallback listen_callback,
     Dart_ServiceStreamCancelCallback cancel_callback) {
   stream_listen_callback_ = listen_callback;
   stream_cancel_callback_ = cancel_callback;
 }
 
 
+void Service::SetGetServiceAssetsCallback(
+    Dart_GetVMServiceAssetsArchive get_service_assets) {
+  get_service_assets_callback_ = get_service_assets;
+}
+
+
 EmbedderServiceHandler* Service::FindRootEmbedderHandler(
     const char* name) {
   EmbedderServiceHandler* current = root_service_handler_head_;
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
@@ skipping 2389 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart