Use native wrapper fields to store socket ids.

runtime/bin/socket.cc

 // Copyright (c) 2012, 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/socket.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
 #include "platform/globals.h"
 #include "platform/thread.h"
 #include "platform/utils.h"
 
 #include "include/dart_api.h"
 
+static const int kSocketIdNativeField = 0;
+
 dart::Mutex Socket::mutex_;
 int Socket::service_ports_size_ = 0;
 Dart_Port* Socket::service_ports_ = NULL;
 int Socket::service_ports_index_ = 0;
 
 void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   const char* host = DartUtils::GetStringValue(Dart_GetNativeArgument(args, 1));
   int64_t port = 0;
   if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 2), &port)) {
     intptr_t socket = Socket::CreateConnect(host, port);
     if (socket >= 0) {
-      DartUtils::SetIntegerField(socket_obj, DartUtils::kIdFieldName, socket);
+      Socket::SetSocketIdNativeField(socket_obj, socket);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       Dart_SetReturnValue(args, DartUtils::NewDartOSError());
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  int64_t socket = DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
-                                              DartUtils::kIdFieldName);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  intptr_t socket = 0;

[Søren Gjesse, 2012/09/21 06:47:06]

Why do you initialize to 0?

[Mads Ager (google), 2012/09/21 08:18:25]

Just to make sure that we have some initialization. If for some weird reason the
GetSocketIdNativeField call fails to assign to it, it is nice to have a
recognizable value when something else fails later.

+  Socket::GetSocketIdNativeField(socket_obj, &socket);
   intptr_t available = Socket::Available(socket);
   if (available >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(available));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_ReadList)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  intptr_t socket =
-      DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
-                                 DartUtils::kIdFieldName);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  intptr_t socket = 0;
+  Socket::GetSocketIdNativeField(socket_obj, &socket);
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
   int64_t offset = 0;
   int64_t length = 0;
   Dart_Handle offset_obj = Dart_GetNativeArgument(args, 2);
   Dart_Handle length_obj = Dart_GetNativeArgument(args, 3);
   if (Dart_IsList(buffer_obj) &&
       DartUtils::GetInt64Value(offset_obj, &offset) &&
       DartUtils::GetInt64Value(length_obj, &length)) {
     intptr_t buffer_len = 0;
     Dart_Handle result = Dart_ListLength(buffer_obj, &buffer_len);
@@ skipping 26 matching lines @@
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
 
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  intptr_t socket =
-      DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
-                                 DartUtils::kIdFieldName);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  intptr_t socket = 0;
+  Socket::GetSocketIdNativeField(socket_obj, &socket);
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
   ASSERT(Dart_IsList(buffer_obj));
   intptr_t offset =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
   intptr_t length =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
   intptr_t buffer_len = 0;
   Dart_Handle result = Dart_ListLength(buffer_obj, &buffer_len);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
@@ skipping 30 matching lines @@
     Dart_SetReturnValue(args, Dart_NewInteger(total_bytes_written));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  intptr_t socket =
-      DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
-                                 DartUtils::kIdFieldName);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  intptr_t socket = 0;
+  Socket::GetSocketIdNativeField(socket_obj, &socket);
   OSError os_error;
   intptr_t port = Socket::GetPort(socket);
   if (port > 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(port));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  intptr_t socket =
-      DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
-                                 DartUtils::kIdFieldName);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  intptr_t socket = 0;
+  Socket::GetSocketIdNativeField(socket_obj, &socket);
   OSError os_error;
   intptr_t port = 0;
   char host[INET_ADDRSTRLEN];
   if (Socket::GetRemotePeer(socket, host, &port)) {
     Dart_Handle list = Dart_NewList(2);
     Dart_ListSetAt(list, 0, Dart_NewString(host));
     Dart_ListSetAt(list, 1, Dart_NewInteger(port));
     Dart_SetReturnValue(args, list);
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  intptr_t socket =
-      DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
-                                 DartUtils::kIdFieldName);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  intptr_t socket = 0;
+  Socket::GetSocketIdNativeField(socket_obj, &socket);
   OSError os_error;
   Socket::GetError(socket, &os_error);
   Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t num =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
   ASSERT(num == 0 || num == 1 || num == 2);
   intptr_t socket = Socket::GetStdioHandle(num);
-  DartUtils::SetIntegerField(
-      socket_obj, DartUtils::kIdFieldName, socket);
+  Socket::SetSocketIdNativeField(socket_obj, socket);
   Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   Dart_Handle bind_address_obj = Dart_GetNativeArgument(args, 1);
   Dart_Handle port_obj = Dart_GetNativeArgument(args, 2);
   Dart_Handle backlog_obj = Dart_GetNativeArgument(args, 3);
   int64_t port = 0;
   int64_t backlog = 0;
   if (Dart_IsString(bind_address_obj) &&
       DartUtils::GetInt64Value(port_obj, &port) &&
       DartUtils::GetInt64Value(backlog_obj, &backlog)) {
     const char* bind_address = DartUtils::GetStringValue(bind_address_obj);
     intptr_t socket =
         ServerSocket::CreateBindListen(bind_address, port, backlog);
     if (socket >= 0) {
-      DartUtils::SetIntegerField(
-          socket_obj, DartUtils::kIdFieldName, socket);
+      Socket::SetSocketIdNativeField(socket_obj, socket);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       if (socket == -5) {
         OSError os_error(-1, "Invalid host", OSError::kUnknown);
         Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
       } else {
         Dart_SetReturnValue(args, DartUtils::NewDartOSError());
       }
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
   Dart_EnterScope();
-  intptr_t socket =
-      DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
-                                 DartUtils::kIdFieldName);
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 1);
+  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
+  intptr_t socket = 0;
+  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  Dart_Handle result_socket_obj = Dart_GetNativeArgument(args, 1);
   intptr_t new_socket = ServerSocket::Accept(socket);
   if (new_socket >= 0) {
-    DartUtils::SetIntegerField(
-        socket_obj, DartUtils::kIdFieldName, new_socket);
+    Socket::SetSocketIdNativeField(result_socket_obj, new_socket);
     Dart_SetReturnValue(args, Dart_True());
   } else if (new_socket == ServerSocket::kTemporaryFailure) {
     Dart_SetReturnValue(args, Dart_False());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
   Dart_ExitScope();
 }
 
 
@@ skipping 68 matching lines @@
   Dart_EnterScope();
   Dart_SetReturnValue(args, Dart_Null());
   Dart_Port service_port = Socket::GetServicePort();
   if (service_port != ILLEGAL_PORT) {
     // Return a send port for the service port.
     Dart_Handle send_port = Dart_NewSendPort(service_port);
     Dart_SetReturnValue(args, send_port);
   }
   Dart_ExitScope();
 }
+
+
+Dart_Handle Socket::SetSocketIdNativeField(Dart_Handle socket, intptr_t id) {
+  return Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
+}
+
+
+Dart_Handle Socket::GetSocketIdNativeField(Dart_Handle socket, intptr_t* id) {
+  return Dart_GetNativeInstanceField(socket, kSocketIdNativeField, id);
+}