- Add a minimal implementation of Capability.

runtime/vm/dart_api_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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
@@ skipping 1213 matching lines @@
   intptr_t len = writer.BytesWritten();
   return PortMap::PostMessage(new Message(
       port_id, data, len, Message::kNormalPriority));
 }
 
 
 DART_EXPORT Dart_Handle Dart_NewSendPort(Dart_Port port_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
-  return Api::NewHandle(isolate, DartLibraryCalls::NewSendPort(port_id));
+  return Api::NewHandle(isolate, SendPort::New(port_id));
 }
 
 
-DART_EXPORT Dart_Handle Dart_PortGetId(Dart_Handle port, Dart_Port* port_id) {
+DART_EXPORT Dart_Handle Dart_ReceivePortGetId(Dart_Handle port,
+                                              Dart_Port* port_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
-  const Instance& port_instance = Api::UnwrapInstanceHandle(isolate, port);
-  if (port_instance.IsNull()) {
-    RETURN_TYPE_ERROR(isolate, port, Instance);
+  const ReceivePort& receive_port = Api::UnwrapReceivePortHandle(isolate, port);
+  if (receive_port.IsNull()) {
+    RETURN_TYPE_ERROR(isolate, port, ReceivePort);
   }

[siva, 2014/04/23 00:20:31]

Missing check:

if (port_id == NULL) {
  RETURN_NULL_ERROR(port_id);
}

[Ivan Posva, 2014/04/23 19:43:35]

Done.

-  if (!DartLibraryCalls::IsSendPort(port_instance) &&
-      !DartLibraryCalls::IsReceivePort(port_instance)) {
-    return Api::NewError("expected an instance of RawReceivePort or SendPort.");
-  }
-  const Object& idObj = Object::Handle(
-      DartLibraryCalls::PortGetId(port_instance));
-  ASSERT(idObj.IsInteger());
-  const Integer& id = Integer::Cast(idObj);
-  *port_id = static_cast<Dart_Port>(id.AsInt64Value());
+  *port_id = static_cast<Dart_Port>(receive_port.Id());
+  ASSERT(*port_id != 0);

[siva, 2014/04/23 00:20:31]

Maybe this assert needs to be inside 'Id()' ?

[Ivan Posva, 2014/04/23 19:43:35]

ASSERT was unnecessary.

   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetReceivePort(Dart_Port port_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
 
   Library& isolate_lib = Library::Handle(isolate, Library::IsolateLibrary());
@@ skipping 18 matching lines @@
 }
 
 
 DART_EXPORT Dart_Port Dart_GetMainPortId() {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
   return isolate->main_port();
 }
 
 
-DART_EXPORT Dart_Handle Dart_PostMessage(Dart_Handle send_port,
+DART_EXPORT Dart_Handle Dart_PostMessage(Dart_Handle port,
                                          Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  Instance& port_instance = Instance::Handle();
-  port_instance ^= Api::UnwrapHandle(send_port);
-  if (!DartLibraryCalls::IsSendPort(port_instance)) {
-    return Api::NewError("send_port is not a SendPort.");
+  const SendPort& send_port = Api::UnwrapSendPortHandle(isolate, port);
+  if (send_port.IsNull()) {
+    RETURN_TYPE_ERROR(isolate, port, SendPort);
   }
-  const Object& idObj = Object::Handle(
-      DartLibraryCalls::PortGetId(port_instance));
-  ASSERT(!idObj.IsError());
-  Integer& id = Integer::Handle();
-  id ^= idObj.raw();
-  Dart_Port port = static_cast<Dart_Port>(id.AsInt64Value());
+  Dart_Port port_id = static_cast<Dart_Port>(send_port.Id());
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator);
   Object& msg_object = Object::Handle(Api::UnwrapHandle(object));
   writer.WriteMessage(msg_object);
   intptr_t len = writer.BytesWritten();
   bool r = PortMap::PostMessage(
-      new Message(port, data, len, Message::kNormalPriority));
+      new Message(port_id, data, len, Message::kNormalPriority));
   if (r) {
     return Api::Success();
   }
   return Api::NewError("Dart_PostMessage failed.");
 }
 
 // --- Scopes ----
 
 DART_EXPORT void Dart_EnterScope() {
   Isolate* isolate = Isolate::Current();
@@ skipping 3387 matching lines @@
 
 
 DART_EXPORT void Dart_RegisterRootServiceRequestCallback(
     const char* name,
     Dart_ServiceRequestCallback callback,
     void* user_data) {
   Service::RegisterRootEmbedderCallback(name, callback, user_data);
 }
 
 }  // namespace dart