Remove the extra IO#descriptor and IO#descriptor= methods

Author: eregon

lib/truffle/socket/basic_socket.rb

@@ -55,11 +55,11 @@ def do_not_reverse_lookup
   end
 
   def getsockopt(level, optname)
-    sockname = Truffle::Socket::Foreign.getsockname(descriptor)
+    sockname = Truffle::Socket::Foreign.getsockname(@descriptor)
     family   = Truffle::Socket.family_for_sockaddr_in(sockname)
     level    = Truffle::Socket::SocketOptions.socket_level(level, family)
     optname  = Truffle::Socket::SocketOptions.socket_option(level, optname)
-    data     = Truffle::Socket::Foreign.getsockopt(descriptor, level, optname)
+    data     = Truffle::Socket::Foreign.getsockopt(@descriptor, level, optname)
 
     Socket::Option.new(family, level, optname, data)
   end
@@ -86,7 +86,7 @@ def setsockopt(level_or_option, optname = nil, optval = nil)
     optval = 1 if optval == true
     optval = 0 if optval == false
 
-    sockname = Truffle::Socket::Foreign.getsockname(descriptor)
+    sockname = Truffle::Socket::Foreign.getsockname(@descriptor)
     family   = Truffle::Socket.family_for_sockaddr_in(sockname)
     level    = Truffle::Socket::SocketOptions.socket_level(level, family)
     optname  = Truffle::Socket::SocketOptions.socket_option(level, optname)
@@ -97,14 +97,14 @@ def setsockopt(level_or_option, optname = nil, optval = nil)
         pointer.write_int(optval)
 
         error = Truffle::Socket::Foreign
-          .setsockopt(descriptor, level, optname, pointer, pointer.total)
+          .setsockopt(@descriptor, level, optname, pointer, pointer.total)
       end
     elsif optval.is_a?(String)
       Truffle::Socket::Foreign.memory_pointer(optval.bytesize) do |pointer|
         pointer.write_string(optval)
 
         error = Truffle::Socket::Foreign
-          .setsockopt(descriptor, level, optname, pointer, optval.bytesize)
+          .setsockopt(@descriptor, level, optname, pointer, optval.bytesize)
       end
     else
       raise TypeError, 'socket option should be an Integer, String, true, or false'
@@ -116,11 +116,11 @@ def setsockopt(level_or_option, optname = nil, optval = nil)
   end
 
   def getsockname
-    Truffle::Socket::Foreign.getsockname(descriptor)
+    Truffle::Socket::Foreign.getsockname(@descriptor)
   end
 
   def getpeername
-    Truffle::Socket::Foreign.getpeername(descriptor)
+    Truffle::Socket::Foreign.getpeername(@descriptor)
   end
 
   def send(message, flags, dest_sockaddr = nil)
@@ -140,13 +140,13 @@ def send(message, flags, dest_sockaddr = nil)
 
         begin
           bytes_sent = Truffle::Socket::Foreign
-            .sendto(descriptor, buffer, bytes, flags, addr, addr.size)
+            .sendto(@descriptor, buffer, bytes, flags, addr, addr.size)
         ensure
           addr.free
         end
       else
         bytes_sent = Truffle::Socket::Foreign
-          .send(descriptor, buffer, bytes, flags)
+          .send(@descriptor, buffer, bytes, flags)
       end
     end
 
@@ -186,7 +186,7 @@ def recvmsg(max_msg_len = nil, flags = 0, *_)
         need_more = false
 
         msg_size = Truffle::Socket::Foreign
-          .recvmsg(descriptor, header.pointer, flags)
+          .recvmsg(@descriptor, header.pointer, flags)
 
         Truffle::Socket::Error.read_error('recvmsg(2)', self) if msg_size < 0
 
@@ -245,7 +245,7 @@ def sendmsg(message, flags = 0, dest_sockaddr = nil, *_)
       end
 
       num_bytes = Truffle::Socket::Foreign
-        .sendmsg(descriptor, header.pointer, flags)
+        .sendmsg(@descriptor, header.pointer, flags)
 
       Truffle::Socket::Error.read_error('sendmsg(2)', self) if num_bytes < 0
 
@@ -271,7 +271,7 @@ def close_read
       return close
     end
 
-    Truffle::Socket::Foreign.shutdown(descriptor, 0)
+    Truffle::Socket::Foreign.shutdown(@descriptor, 0)
 
     force_write_only
 
@@ -285,7 +285,7 @@ def close_write
       return close
     end
 
-    Truffle::Socket::Foreign.shutdown(descriptor, 1)
+    Truffle::Socket::Foreign.shutdown(@descriptor, 1)
 
     force_read_only
 
@@ -302,7 +302,7 @@ def recv_nonblock(bytes_to_read, flags = 0)
 
   def shutdown(how = Socket::SHUT_RDWR)
     how = Truffle::Socket.shutdown_option(how)
-    err = Truffle::Socket::Foreign.shutdown(descriptor, how)
+    err = Truffle::Socket::Foreign.shutdown(@descriptor, how)
 
     Errno.handle('shutdown(2)') unless err == 0
 
@@ -324,6 +324,6 @@ def remote_address
   end
 
   def getpeereid
-    Truffle::Socket::Foreign.getpeereid(descriptor)
+    Truffle::Socket::Foreign.getpeereid(@descriptor)
   end
 end

lib/truffle/socket/socket.rb

@@ -313,7 +313,7 @@ def bind(addr)
       addr = addr.to_sockaddr
     end
 
-    err = Truffle::Socket::Foreign.bind(descriptor, addr)
+    err = Truffle::Socket::Foreign.bind(@descriptor, addr)
 
     Errno.handle('bind(2)') unless err == 0
 
@@ -325,7 +325,7 @@ def connect(sockaddr)
       sockaddr = sockaddr.to_sockaddr
     end
 
-    status = Truffle::Socket::Foreign.connect(descriptor, sockaddr)
+    status = Truffle::Socket::Foreign.connect(@descriptor, sockaddr)
 
     Truffle::Socket::Error.write_error('connect(2)', self) if status < 0
 
@@ -339,7 +339,7 @@ def connect_nonblock(sockaddr, exception: true)
       sockaddr = sockaddr.to_sockaddr
     end
 
-    status = Truffle::Socket::Foreign.connect(descriptor, sockaddr)
+    status = Truffle::Socket::Foreign.connect(@descriptor, sockaddr)
 
     if status < 0
       if exception
@@ -360,13 +360,13 @@ def connect_nonblock(sockaddr, exception: true)
   end
 
   def local_address
-    sockaddr = Truffle::Socket::Foreign.getsockname(descriptor)
+    sockaddr = Truffle::Socket::Foreign.getsockname(@descriptor)
 
     Addrinfo.new(sockaddr, @family, @socket_type, 0)
   end
 
   def remote_address
-    sockaddr = Truffle::Socket::Foreign.getpeername(descriptor)
+    sockaddr = Truffle::Socket::Foreign.getpeername(@descriptor)
 
     Addrinfo.new(sockaddr, @family, @socket_type, 0)
   end

lib/truffle/socket/truffle.rb

@@ -76,7 +76,7 @@ def self.accept(source, new_class)
           size_p.write_int(sockaddr.size)
 
           Truffle::Socket::Foreign
-            .accept(source.descriptor, sockaddr.pointer, size_p)
+            .accept(source.fileno, sockaddr.pointer, size_p)
         end
 
         Error.read_error('accept(2)', source) if fd < 0
@@ -108,7 +108,7 @@ def self.accept_nonblock(source, new_class, exception)
 
     def self.listen(source, backlog)
       backlog = Truffle::Type.coerce_to_int(backlog)
-      err     = Foreign.listen(source.descriptor, backlog)
+      err     = Foreign.listen(source.fileno, backlog)
 
       Error.read_error('listen(2)', source) if err < 0
 
@@ -322,7 +322,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.descriptor)
+      sockaddr = Foreign.__send__(method, socket.fileno)
 
       reverse_lookup = convert_reverse_lookup(socket, reverse_lookup)
 

lib/truffle/socket/udp_socket.rb

@@ -41,7 +41,7 @@ def initialize(family = Socket::AF_INET)
   def bind(host, port)
     addr = Truffle::Socket::Foreign.pack_sockaddr_in(
         host, port.to_i, @family, Socket::SOCK_DGRAM, 0)
-    status = Truffle::Socket::Foreign.bind(descriptor, addr)
+    status = Truffle::Socket::Foreign.bind(@descriptor, addr)
 
     Errno.handle('bind(2)') if status < 0
 
@@ -52,7 +52,7 @@ def connect(host, port)
     sockaddr = Truffle::Socket::Foreign.pack_sockaddr_in(
         host, port.to_i, @family, Socket::SOCK_DGRAM, 0)
 
-    status = Truffle::Socket::Foreign.connect(descriptor, sockaddr)
+    status = Truffle::Socket::Foreign.connect(@descriptor, sockaddr)
 
     Truffle::Socket::Error.write_error('connect(2)', self) if status < 0
 

lib/truffle/socket/unix_server.rb

@@ -37,7 +37,7 @@ def initialize(path)
     binmode
 
     sockaddr = Socket.sockaddr_un(@path)
-    status   = Truffle::Socket::Foreign.bind(descriptor, sockaddr)
+    status   = Truffle::Socket::Foreign.bind(@descriptor, sockaddr)
 
     Errno.handle('bind(2)') if status < 0
 

lib/truffle/socket/unix_socket.rb

@@ -50,7 +50,7 @@ def initialize(path)
     binmode
 
     sockaddr = Socket.sockaddr_un(Truffle::Type.check_null_safe(path))
-    status   = Truffle::Socket::Foreign.connect(descriptor, sockaddr)
+    status   = Truffle::Socket::Foreign.connect(@descriptor, sockaddr)
 
     Errno.handle('connect(2)') if status < 0
   end
@@ -64,15 +64,15 @@ def recvfrom(bytes_read, flags = 0)
   end
 
   def path
-    @path ||= Truffle::Socket::Foreign.getsockname(descriptor).unpack('SZ*')[1]
+    @path ||= Truffle::Socket::Foreign.getsockname(@descriptor).unpack('SZ*')[1]
   end
 
   def addr
     ['AF_UNIX', path]
   end
 
   def peeraddr
-    path = Truffle::Socket::Foreign.getpeername(descriptor).unpack('SZ*')[1]
+    path = Truffle::Socket::Foreign.getpeername(@descriptor).unpack('SZ*')[1]
 
     ['AF_UNIX', path]
   end

spec/tags/truffle/methods_tags.txt

@@ -23,8 +23,6 @@ fails:Public methods on Hash should not include sort
 fails:Public methods on IO should include fdatasync
 fails:Public methods on IO should include pread
 fails:Public methods on IO should include pwrite
-fails:Public methods on IO should not include descriptor
-fails:Public methods on IO should not include descriptor=
 fails:Public methods on IO should not include dup
 fails:Public methods on IO should not include encode_with
 fails:Public methods on IO should not include eof!

src/main/ruby/truffleruby/core/io.rb

@@ -348,8 +348,6 @@ def inspect # :nodoc:
     end
   end
 
-  attr_accessor :descriptor
-
   def mode_read_only?
     @mode & ACCMODE == RDONLY
   end
@@ -1127,10 +1125,10 @@ def self.setup(io, fd, mode=nil, sync=false)
     end
 
     # Close old descriptor if there was already one associated
-    io.close if io.descriptor != -1
+    io.close if io.instance_variable_get(:@descriptor) != -1
 
-    io.descriptor = fd
-    io.instance_variable_set(:@mode, mode || cur_mode)
+    io.instance_variable_set :@descriptor, fd
+    io.instance_variable_set :@mode, mode || cur_mode
     io.sync       = !!sync
     io.autoclose  = true
     io.instance_variable_set :@ibuffer, IO::InternalBuffer.new
@@ -1676,7 +1674,7 @@ def fcntl(command, arg=0)
     end
 
     command = Truffle::Type.coerce_to_int command
-    Truffle::POSIX.fcntl descriptor, command, arg
+    Truffle::POSIX.fcntl @descriptor, command, arg
   end
 
   def internal_encoding
@@ -1713,7 +1711,7 @@ def ioctl(command, arg = 0)
     end
 
     command = Truffle::Type.coerce_to_int(command)
-    ret = Truffle::POSIX.ioctl(descriptor, command, real_arg)
+    ret = Truffle::POSIX.ioctl(@descriptor, command, real_arg)
     Errno.handle if ret < 0
 
     if arg.kind_of?(String)

src/main/ruby/truffleruby/core/posix.rb

@@ -366,7 +366,7 @@ def self.read_string_nonblock(io, count)
   # by IO#sysread
 
   def self.read_string_native(io, length)
-    fd = io.descriptor
+    fd = io.fileno
     buffer = Truffle.invoke_primitive(:io_get_thread_buffer, length)
     bytes_read = Truffle::POSIX.read(fd, buffer, length)
     if bytes_read < 0
@@ -387,7 +387,7 @@ def self.read_string_native(io, length)
   end
 
   def self.read_string_polyglot(io, length)
-    fd = io.descriptor
+    fd = io.fileno
     if fd == 0
       read = Truffle.invoke_primitive :io_read_polyglot, length
       [read, 0]
@@ -400,7 +400,7 @@ def self.read_string_polyglot(io, length)
   # called by IO#syswrite, IO#write, and IO::InternalBuffer#empty_to
 
   def self.write_string_native(io, string, continue_on_eagain)
-    fd = io.descriptor
+    fd = io.fileno
     length = string.bytesize
     buffer = Truffle.invoke_primitive(:io_get_thread_buffer, length)
     buffer.write_string string
@@ -426,7 +426,7 @@ def self.write_string_native(io, string, continue_on_eagain)
   end
 
   def self.write_string_polyglot(io, string, continue_on_eagain)
-    fd = io.descriptor
+    fd = io.fileno
     if fd == 1 || fd == 2
 
       # continue_on_eagain is set for IO::InternalBuffer#empty_to, for IO#write
@@ -444,7 +444,7 @@ def self.write_string_polyglot(io, string, continue_on_eagain)
   # #write_string_nonblock_polylgot) is called by IO#write_nonblock
 
   def self.write_string_nonblock_native(io, string)
-    fd = io.descriptor
+    fd = io.fileno
     length = string.bytesize
     buffer = Truffle.invoke_primitive(:io_get_thread_buffer, length)
     buffer.write_string string
@@ -462,7 +462,7 @@ def self.write_string_nonblock_native(io, string)
   end
 
   def self.write_string_nonblock_polyglot(io, string)
-    fd = io.descriptor
+    fd = io.fileno
     if fd == 1 || fd == 2
 
       # We only come here from IO#write_nonblock. What happens in a polyglot

src/main/ruby/truffleruby/core/stat.rb

@@ -103,7 +103,7 @@ def self.fstat(fd)
       fd = Truffle::Type.coerce_to fd, Integer, :to_int
       Truffle::FFI::MemoryPointer.new(:uint64, BUFFER_ELEMENTS) do |ptr|
         result = Truffle::POSIX.truffleposix_fstat(fd, ptr)
-        Errno.handle "file descriptor #{descriptor}" unless result == 0
+        Errno.handle "file descriptor #{fd}" unless result == 0
         Stat.new ptr
       end
     end