- First step in refactoring ports with the goal of moving

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 1171 matching lines @@
 
 
 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));
 }
 
 
+DART_EXPORT Dart_Handle Dart_PortGetId(Dart_Handle port, Dart_Port* port_id) {
+  Isolate* isolate = Isolate::Current();
+  DARTSCOPE(isolate);
+  CHECK_CALLBACK_STATE(isolate);
+  Instance& port_instance = Instance::Handle(isolate);
+  port_instance ^= Api::UnwrapHandle(port);

[siva, 2014/03/25 23:42:51]

Maybe you should use:

const Instance& port_instance = Api::UnwrapInstanceHandle(isolate, port);
if (port_instance.IsNull()) {
  RETURN_TYPE_ERROR(isolate, port, Instance);
}

That way you return an error if invalid objects are passed in for 'port'. This
pattern is used in other functions.

[Ivan Posva, 2014/03/26 17:17:31]

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.IsError());

[siva, 2014/03/25 23:42:51]

ASSERT(idObj.IsInteger());
const Integer id = Integer::Cast(idObj);

[Ivan Posva, 2014/03/26 17:17:31]

Done.

+  Integer& id = Integer::Handle();
+  id ^= idObj.raw();
+  *port_id = static_cast<Dart_Port>(id.AsInt64Value());
+  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());
   ASSERT(!isolate_lib.IsNull());
   const String& class_name = String::Handle(
       isolate, isolate_lib.PrivateName(Symbols::_RawReceivePortImpl()));
   // TODO(asiva): Symbols should contain private keys.
   const String& function_name =
-      String::Handle(isolate_lib.PrivateName(Symbols::_get_or_create()));
+      String::Handle(isolate_lib.PrivateName(Symbols::_get()));
   const int kNumArguments = 1;
   const Function& function = Function::Handle(
       isolate,
       Resolver::ResolveStatic(isolate_lib,
                               class_name,
                               function_name,
                               kNumArguments,
                               Object::empty_array()));
   ASSERT(!function.IsNull());
   const Array& args = Array::Handle(isolate, Array::New(kNumArguments));
@@ skipping 3426 matching lines @@
 
 
 DART_EXPORT void Dart_RegisterRootServiceRequestCallback(
     const char* name,
     Dart_ServiceRequestCallback callback,
     void* user_data) {
   Service::RegisterRootEmbedderCallback(name, callback, user_data);
 }
 
 }  // namespace dart