Pass a Socket to getsockname/getpeername and not just a fd

* So we can check if the socket is closed there.

Author: eregon

lib/truffle/socket/basic_socket.rb

@@ -57,7 +57,7 @@ def do_not_reverse_lookup
   end
 
   def getsockopt(level, optname)
-    sockname = Truffle::Socket::Foreign.getsockname(Primitive.io_fd(self))
+    sockname = Truffle::Socket::Foreign.getsockname(self)
     family   = Truffle::Socket.family_for_sockaddr_in(sockname)
     level    = Truffle::Socket::SocketOptions.socket_level(level, family)
     optname  = Truffle::Socket::SocketOptions.socket_option(level, optname)
@@ -78,7 +78,7 @@ def setsockopt(*args)
       Truffle::Type.check_arity(args.size, 3, 3)
     end
 
-    sockname = Truffle::Socket::Foreign.getsockname(Primitive.io_fd(self))
+    sockname = Truffle::Socket::Foreign.getsockname(self)
     family   = Truffle::Socket.family_for_sockaddr_in(sockname)
     level    = Truffle::Socket::SocketOptions.socket_level(level, family)
     optname  = Truffle::Socket::SocketOptions.socket_option(level, optname)
@@ -113,11 +113,11 @@ def setsockopt(*args)
   end
 
   def getsockname
-    Truffle::Socket::Foreign.getsockname(Primitive.io_fd(self))
+    Truffle::Socket::Foreign.getsockname(self)
   end
 
   def getpeername
-    Truffle::Socket::Foreign.getpeername(Primitive.io_fd(self))
+    Truffle::Socket::Foreign.getpeername(self)
   end
 
   def send(message, flags, dest_sockaddr = nil)

lib/truffle/socket/socket.rb

@@ -373,13 +373,13 @@ def connect(sockaddr)
   end
 
   def local_address
-    sockaddr = Truffle::Socket::Foreign.getsockname(Primitive.io_fd(self))
+    sockaddr = Truffle::Socket::Foreign.getsockname(self)
 
     Addrinfo.new(sockaddr, @family, @socket_type, 0)
   end
 
   def remote_address
-    sockaddr = Truffle::Socket::Foreign.getpeername(Primitive.io_fd(self))
+    sockaddr = Truffle::Socket::Foreign.getpeername(self)
 
     Addrinfo.new(sockaddr, @family, @socket_type, 0)
   end

lib/truffle/socket/truffle.rb

@@ -340,7 +340,7 @@ def self.convert_reverse_lookup(socket = nil, reverse_lookup = nil)
     end
 
     def self.address_info(method, socket, reverse_lookup = nil)
-      sockaddr = Foreign.__send__(method, socket.fileno)
+      sockaddr = Foreign.__send__(method, socket)
 
       reverse_lookup = convert_reverse_lookup(socket, reverse_lookup)
 

lib/truffle/socket/truffle/foreign.rb

@@ -229,12 +229,11 @@ def self.getnameinfo(sockaddr, flags = ::Socket::NI_NUMERICHOST | ::Socket::NI_N
         end
       end
 
-      def self.getpeername(descriptor)
+      def self.getpeername(socket)
         buffer, sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(128, Primitive.pointer_find_type_size(:socklen_t))
         begin
           len_p.write_int(128)
-
-          err = _getpeername(descriptor, sockaddr_storage_p, len_p)
+          err = _getpeername(socket.fileno, sockaddr_storage_p, len_p)
 
           Errno.handle('getpeername(2)') unless err == 0
 
@@ -244,11 +243,11 @@ def self.getpeername(descriptor)
         end
       end
 
-      def self.getsockname(descriptor)
+      def self.getsockname(socket)
         buffer, sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(128, Primitive.pointer_find_type_size(:socklen_t))
         begin
           len_p.write_int(128)
-          err = _getsockname(descriptor, sockaddr_storage_p, len_p)
+          err = _getsockname(socket.fileno, sockaddr_storage_p, len_p)
 
           Errno.handle('getsockname(2)') unless err == 0
 

lib/truffle/socket/unix_socket.rb

@@ -66,15 +66,15 @@ def recvfrom(bytes_read, flags = 0)
   end
 
   def path
-    @path ||= Truffle::Socket::Foreign.getsockname(Primitive.io_fd(self)).unpack('SZ*')[1]
+    @path ||= Truffle::Socket::Foreign.getsockname(self).unpack('SZ*')[1]
   end
 
   def addr
     ['AF_UNIX', path]
   end
 
   def peeraddr
-    path = Truffle::Socket::Foreign.getpeername(Primitive.io_fd(self)).unpack('SZ*')[1]
+    path = Truffle::Socket::Foreign.getpeername(self).unpack('SZ*')[1]
 
     ['AF_UNIX', path]
   end