- Add a minimal implementation of Capability.

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 "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 140 matching lines @@
   void* new_ptr = realloc(reinterpret_cast<void*>(ptr), new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 static void SendIsolateServiceMessage(Dart_NativeArguments args) {
   NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
   Isolate* isolate = arguments->isolate();
   StackZone zone(isolate);
   HANDLESCOPE(isolate);
-  GET_NON_NULL_NATIVE_ARGUMENT(Instance, sp, arguments->NativeArgAt(0));
+  GET_NON_NULL_NATIVE_ARGUMENT(SendPort, sp, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(1));
 
-  // Extract SendPort port id.
-  const Object& sp_id_obj = Object::Handle(DartLibraryCalls::PortGetId(sp));
-  if (sp_id_obj.IsError()) {
-    Exceptions::PropagateError(Error::Cast(sp_id_obj));
-  }
-  Integer& id = Integer::Handle(isolate);
-  id ^= sp_id_obj.raw();
-  Dart_Port sp_id = static_cast<Dart_Port>(id.AsInt64Value());
-  ASSERT(sp_id != ILLEGAL_PORT);
-
   // Serialize message.
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator);
   writer.WriteMessage(message);
 
   // TODO(turnidge): Throw an exception when the return value is false?
-  PortMap::PostMessage(new Message(sp_id, data, writer.BytesWritten(),
+  PortMap::PostMessage(new Message(sp.Id(), data, writer.BytesWritten(),
                                    Message::kOOBPriority));
 }
 
 
 static void SendRootServiceMessage(Dart_NativeArguments args) {
   NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
   Isolate* isolate = arguments->isolate();
   StackZone zone(isolate);
   HANDLESCOPE(isolate);
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(0));
@@ skipping 43 matching lines @@
 Isolate* Service::service_isolate_ = NULL;
 Dart_LibraryTagHandler Service::default_handler_ = NULL;
 Dart_Port Service::port_ = ILLEGAL_PORT;
 
 
 static Dart_Port ExtractPort(Dart_Handle receivePort) {
   HANDLESCOPE(Isolate::Current());
   const Object& unwrapped_rp = Object::Handle(Api::UnwrapHandle(receivePort));
   const Instance& rp = Instance::Cast(unwrapped_rp);
   // Extract RawReceivePort port id.
-  const Object& rp_id_obj = Object::Handle(DartLibraryCalls::PortGetId(rp));
-  if (rp_id_obj.IsError()) {
+  if (!rp.IsReceivePort()) {
     return ILLEGAL_PORT;
   }
-  ASSERT(rp_id_obj.IsSmi() || rp_id_obj.IsMint());
-  const Integer& id = Integer::Cast(rp_id_obj);
-  return static_cast<Dart_Port>(id.AsInt64Value());
+  return ReceivePort::Cast(rp).Id();
 }
 
 
 Isolate* Service::GetServiceIsolate(void* callback_data) {
   if (service_isolate_ != NULL) {
     // Already initialized, return service isolate.
     return service_isolate_;
   }
   Dart_ServiceIsolateCreateCalback create_callback =
     Isolate::ServiceCreateCallback();
@@ skipping 77 matching lines @@
 #define VM_SERVICE_ISOLATE_STARTUP_MESSAGE_ID 1
 #define VM_SERVICE_ISOLATE_SHUTDOWN_MESSAGE_ID 2
 
 
 static RawArray* MakeServiceControlMessage(Dart_Port port_id, intptr_t code,
                                            const String& name) {
   const Array& list = Array::Handle(Array::New(4));
   ASSERT(!list.IsNull());
   const Integer& code_int = Integer::Handle(Integer::New(code));
   const Integer& port_int = Integer::Handle(Integer::New(port_id));
-  const Object& send_port = Object::Handle(
-      DartLibraryCalls::NewSendPort(port_id));
+  const SendPort& send_port = SendPort::Handle(SendPort::New(port_id));
   ASSERT(!send_port.IsNull());
   list.SetAt(0, code_int);
   list.SetAt(1, port_int);
   list.SetAt(2, send_port);
   list.SetAt(3, name);
   return list.raw();
 }
 
 
 bool Service::SendIsolateStartupMessage() {
@@ skipping 234 matching lines @@
     path ^= message.At(1);
     option_keys ^= message.At(2);
     option_values ^= message.At(3);
 
     ASSERT(!path.IsNull());
     ASSERT(!option_keys.IsNull());
     ASSERT(!option_values.IsNull());
     // Same number of option keys as values.
     ASSERT(option_keys.Length() == option_values.Length());
 
+    if (!reply_port.IsSendPort()) {
+      FATAL("SendPort expected.");
+    }
+
     String& path_segment = String::Handle();
     if (path.Length() > 0) {
       path_segment ^= path.At(0);
     } else {
       path_segment ^= Symbols::Empty().raw();
     }
     ASSERT(!path_segment.IsNull());
     const char* path_segment_c = path_segment.ToCString();
 
     IsolateMessageHandler handler =
         FindIsolateMessageHandler(path_segment_c);
     {
       JSONStream js;
-      js.Setup(zone.GetZone(), reply_port, path, option_keys, option_values);
+      js.Setup(zone.GetZone(), SendPort::Cast(

[turnidge, 2014/04/22 18:40:45]

strange line break.

[Ivan Posva, 2014/04/22 21:28:30]

Changed, but there is no good way to make this fit well.

+          reply_port).Id(), path, option_keys, option_values);
       if (handler == NULL) {
         // Check for an embedder handler.
         EmbedderServiceHandler* e_handler =
             FindIsolateEmbedderHandler(path_segment_c);
         if (e_handler != NULL) {
           EmbedderHandleMessage(e_handler, &js);
         } else {
           PrintError(&js, "Unrecognized path");
         }
         js.PostReply();
@@ skipping 1054 matching lines @@
     HANDLESCOPE(isolate);
 
     const GrowableObjectArray& message = GrowableObjectArray::Cast(msg);
     // Message is a list with four entries.
     ASSERT(message.Length() == 4);
 
     Instance& reply_port = Instance::Handle(isolate);
     GrowableObjectArray& path = GrowableObjectArray::Handle(isolate);
     GrowableObjectArray& option_keys = GrowableObjectArray::Handle(isolate);
     GrowableObjectArray& option_values = GrowableObjectArray::Handle(isolate);
+
     reply_port ^= message.At(0);
     path ^= message.At(1);
     option_keys ^= message.At(2);
     option_values ^= message.At(3);
 
     ASSERT(!path.IsNull());
     ASSERT(!option_keys.IsNull());
     ASSERT(!option_values.IsNull());
     // Path always has at least one entry in it.
     ASSERT(path.Length() > 0);
     // Same number of option keys as values.
     ASSERT(option_keys.Length() == option_values.Length());
 
+    if (!reply_port.IsSendPort()) {
+      FATAL("SendPort expected.");

[Cutch, 2014/04/22 20:15:22]

Why not ASSERT(reply_port.IsSendPort()) here and above?

+    }
+
     String& path_segment = String::Handle();
     if (path.Length() > 0) {
       path_segment ^= path.At(0);
     } else {
       path_segment ^= Symbols::Empty().raw();
     }
     ASSERT(!path_segment.IsNull());
     const char* path_segment_c = path_segment.ToCString();
 
     RootMessageHandler handler =
         FindRootMessageHandler(path_segment_c);
     {
       JSONStream js;
-      js.Setup(zone.GetZone(), reply_port, path, option_keys, option_values);
+      js.Setup(zone.GetZone(), SendPort::Cast(

[turnidge, 2014/04/22 18:40:45]

ditto

+          reply_port).Id(), path, option_keys, option_values);
       if (handler == NULL) {
         // Check for an embedder handler.
         EmbedderServiceHandler* e_handler =
             FindRootEmbedderHandler(path_segment_c);
         if (e_handler != NULL) {
           EmbedderHandleMessage(e_handler, &js);
         } else {
           PrintError(&js, "Unrecognized path");
         }
         js.PostReply();
@@ skipping 171 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart