[GR-14806] Update specs

PullRequest: truffleruby/2905

Author: eregon

.github/workflows/ci.yml

@@ -202,7 +202,4 @@ jobs:
           bundler: none
       - name: Setup jt
         run: echo "$PWD/bin" >> $GITHUB_PATH
-      - name: Install webrick for Ruby 3+
-        run: gem install webrick
-        if: startsWith(matrix.ruby, '3.')
       - run: CHECK_LEAKS=true jt -u ruby mspec -fdot --timeout 30 spec/ruby

lib/cext/ABI_version.txt

@@ -1 +1 @@
-10
+11

lib/truffle/rbconfig.rb

@@ -162,7 +162,7 @@ module RbConfig
     'LIBEXT'            => 'a',
     'LIBPATHENV'        => 'LD_LIBRARY_PATH',
     'LIBPATHFLAG'       => ' -L%1$-s',
-    'LIBRUBY'           => '',
+    'LIBRUBY'           => "cext/libtruffleruby.#{Truffle::Platform::SOEXT}",
     'LIBRUBY_A'         => '',
     'LIBRUBYARG'        => librubyarg,
     'LIBRUBYARG_SHARED' => librubyarg,

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
@@ -406,11 +406,12 @@ def listen(backlog)
   end
 
   def accept
-    Truffle::Socket.accept(self, Socket)
+    Truffle::Socket.accept_and_addrinfo(self, Socket, true)
   end
 
   private def __accept_nonblock(exception)
-    Truffle::Socket.accept_nonblock(self, Socket, exception)
+    self.nonblock = true
+    Truffle::Socket.accept_and_addrinfo(self, Socket, exception)
   end
 
   def sysaccept

lib/truffle/socket/tcp_server.rb

@@ -63,15 +63,12 @@ def listen(backlog)
   end
 
   def accept
-    socket, _ = Truffle::Socket.accept(self, TCPSocket)
-
-    socket
+    Truffle::Socket.accept(self, TCPSocket, true)
   end
 
   private def __accept_nonblock(exception)
-    socket, _ = Truffle::Socket.accept_nonblock(self, TCPSocket, exception)
-
-    socket
+    self.nonblock = true
+    Truffle::Socket.accept(self, TCPSocket, exception)
   end
 
   def sysaccept

lib/truffle/socket/truffle.rb

@@ -93,7 +93,7 @@ def self.sockaddr_class_for_socket(socket)
       end
     end
 
-    def self.internal_accept(source, new_class, exception)
+    def self.accept_and_addrinfo(source, new_class, exception)
       raise IOError, 'socket has been closed' if source.closed?
 
       sockaddr = sockaddr_class_for_socket(source).new
@@ -123,16 +123,20 @@ def self.internal_accept(source, new_class, exception)
         sockaddr.pointer.free
       end
     end
-    private_class_method :internal_accept
 
-    def self.accept(source, new_class)
-      internal_accept(source, new_class, true)
-    end
+    def self.accept(source, new_class, exception)
+      raise IOError, 'socket has been closed' if source.closed?
 
-    def self.accept_nonblock(source, new_class, exception)
-      source.nonblock = true
+      fd = Truffle::Socket::Foreign.accept(source.fileno, ::FFI::Pointer::NULL, ::FFI::Pointer::NULL)
+      if fd < 0
+        if !exception and Errno.errno == Truffle::POSIX::EAGAIN_ERRNO
+          return :wait_readable
+        else
+          Error.read_error('accept(2)', source)
+        end
+      end
 
-      internal_accept(source, new_class, exception)
+      new_class.for_fd(fd)
     end
 
     def self.listen(source, backlog)
@@ -351,7 +355,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_server.rb

@@ -51,15 +51,12 @@ def listen(backlog)
   end
 
   def accept
-    socket, _ = Truffle::Socket.accept(self, UNIXSocket)
-
-    socket
+    Truffle::Socket.accept(self, UNIXSocket, true)
   end
 
   private def __accept_nonblock(exception)
-    socket, _ = Truffle::Socket.accept_nonblock(self, UNIXSocket, exception)
-
-    socket
+    self.nonblock = true
+    Truffle::Socket.accept(self, UNIXSocket, exception)
   end
 
   def sysaccept

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