[GR-18163] Avoid creating autorelease pointers when spawning subprocesses (#2264)

PullRequest: truffleruby/2436

Author: eregon

lib/truffle/socket/truffle/foreign.rb

@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
@@ -95,31 +97,30 @@ module Foreign
       attach_function :freeifaddrs, [:pointer], :void
 
       def self.bind(descriptor, sockaddr)
-        sockaddr_p = Truffle::FFI::Pool.stack_alloc(:char, sockaddr.bytesize)
+        sockaddr_p = Primitive.io_thread_buffer_allocate(sockaddr.bytesize)
         begin
           sockaddr_p.write_bytes(sockaddr)
           _bind(descriptor, sockaddr_p, sockaddr.bytesize)
         ensure
-          Truffle::FFI::Pool.stack_free(sockaddr_p)
+          Primitive.io_thread_buffer_free(sockaddr_p)
         end
       end
 
       def self.connect(descriptor, sockaddr)
         sockaddr = Socket.coerce_to_string(sockaddr)
 
-        sockaddr_p = Truffle::FFI::Pool.stack_alloc(:char, sockaddr.bytesize)
-
+        sockaddr_p = Primitive.io_thread_buffer_allocate(sockaddr.bytesize)
         begin
           sockaddr_p.write_bytes(sockaddr)
 
           _connect(descriptor, sockaddr_p, sockaddr.bytesize)
         ensure
-          Truffle::FFI::Pool.stack_free(sockaddr_p)
+          Primitive.io_thread_buffer_free(sockaddr_p)
         end
       end
 
       def self.getsockopt(descriptor, level, optname)
-        val, length = Truffle::FFI::Pool.stack_alloc(:char, 256, :socklen_t, 1)
+        val, length = Truffle::FFI::Pool.stack_alloc(256, Primitive.pointer_find_type_size(:socklen_t))
 
         begin
           length.write_int(256)
@@ -143,10 +144,10 @@ def self.getaddrinfo(host, service = nil, family = nil, socktype = nil,
         hints[:ai_protocol] = protocol || 0
         hints[:ai_flags]    = flags || 0
 
-        res_p = Truffle::FFI::Pool.stack_alloc(:pointer, 1)
+        res_p = Primitive.io_thread_buffer_allocate(Primitive.pointer_find_type_size(:pointer))
 
         res_p.clear
-        err   = _getaddrinfo(host, service, hints.pointer, res_p)
+        err = _getaddrinfo(host, service, hints.pointer, res_p)
 
         raise SocketError, gai_strerror(err) unless err == 0
 
@@ -183,7 +184,7 @@ def self.getaddrinfo(host, service = nil, family = nil, socktype = nil,
 
           # Be sure to feed a legit pointer to freeaddrinfo
           freeaddrinfo(ptr) unless ptr.null?
-          Truffle::FFI::Pool.stack_free(res_p)
+          Primitive.io_thread_buffer_free(res_p)
         end
       end
 
@@ -198,7 +199,7 @@ def self.getnameinfo(sockaddr, flags = ::Socket::NI_NUMERICHOST | ::Socket::NI_N
         name_info = []
 
         sockaddr_p, node, service = Truffle::FFI::Pool.stack_alloc(
-          :char, sockaddr.bytesize, :char, ::Socket::NI_MAXHOST, :char, ::Socket::NI_MAXSERV)
+          sockaddr.bytesize, ::Socket::NI_MAXHOST, ::Socket::NI_MAXSERV)
 
         begin
           sockaddr_p.write_bytes(sockaddr)
@@ -231,7 +232,7 @@ def self.getnameinfo(sockaddr, flags = ::Socket::NI_NUMERICHOST | ::Socket::NI_N
       end
 
       def self.getpeername(descriptor)
-        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(:char, 128, :socklen_t, 1)
+        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(128, Primitive.pointer_find_type_size(:socklen_t))
         begin
           len_p.write_int(128)
 
@@ -246,7 +247,7 @@ def self.getpeername(descriptor)
       end
 
       def self.getsockname(descriptor)
-        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(:char, 128, :socklen_t, 1)
+        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(128, Primitive.pointer_find_type_size(:socklen_t))
 
         begin
           len_p.write_int(128)
@@ -283,7 +284,7 @@ def self.pack_sockaddr_in(host, port, family = ::Socket::AF_UNSPEC,
           host = '0.0.0.0'
         end
 
-        res_p = Truffle::FFI::Pool.stack_alloc(:pointer, 1)
+        res_p = Primitive.io_thread_buffer_allocate(Primitive.pointer_find_type_size(:pointer))
         res_p.clear
 
         err = _getaddrinfo(host, port.to_s, hints.pointer, res_p)
@@ -302,7 +303,7 @@ def self.pack_sockaddr_in(host, port, family = ::Socket::AF_UNSPEC,
           ptr = res_p.read_pointer
 
           freeaddrinfo(ptr) unless ptr.null?
-          Truffle::FFI::Pool.stack_free(res_p)
+          Primitive.io_thread_buffer_free(res_p)
         end
       end
 
@@ -328,7 +329,7 @@ def self.getpeereid(*)
       end
 
       def self.socketpair(family, type, protocol)
-        pointer = Truffle::FFI::Pool.stack_alloc(:int, 2)
+        pointer = Primitive.io_thread_buffer_allocate(Primitive.pointer_find_type_size(:int) * 2)
         begin
           pointer.clear
           status = _socketpair(family, type, protocol, pointer)
@@ -337,7 +338,7 @@ def self.socketpair(family, type, protocol)
 
           pointer.read_array_of_int(2)
         ensure
-          Truffle::FFI::Pool.stack_free(pointer)
+          Primitive.io_thread_buffer_free(pointer)
         end
       end
 
@@ -373,7 +374,7 @@ def self.ip_to_bytes(family, address)
           address = address[0...i]
         end
 
-        pointer = Truffle::FFI::Pool.stack_alloc(:pointer, size)
+        pointer = Primitive.io_thread_buffer_allocate(Primitive.pointer_find_type_size(:pointer) * size)
 
         begin
           status = inet_pton(family, address, pointer)
@@ -382,7 +383,7 @@ def self.ip_to_bytes(family, address)
 
           pointer.get_array_of_uchar(0, size)
         ensure
-          Truffle::FFI::Pool.stack_free(pointer)
+          Primitive.io_thread_buffer_free(pointer)
         end
       end
     end

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

@@ -326,12 +326,15 @@ def self.with_array_of_ints(ints)
 
   def self.with_array_of_strings_pointer(strings)
     Truffle::FFI::MemoryPointer.new(:pointer, strings.size + 1) do |ptr|
-      pointers = strings.map do |str|
-        Truffle::FFI::MemoryPointer.from_string(str)
+      pointers = Truffle::FFI::Pool.stack_alloc(*strings.map { |s| s.bytesize + 1 })
+      begin
+        pointers.zip(strings) { |sp, s| sp.put_string(0, s) }
+        pointers << Truffle::FFI::Pointer::NULL
+        ptr.write_array_of_pointer pointers
+        yield(ptr)
+      ensure
+        Truffle::FFI::Pool.stack_free(pointers[0])
       end
-      pointers << Truffle::FFI::Pointer::NULL
-      ptr.write_array_of_pointer pointers
-      yield(ptr)
     end
   end
 

src/main/ruby/truffleruby/core/truffle/ffi/pointer.rb

@@ -266,30 +266,23 @@ def self.from_string(str)
   end
 
   class Pool
-
+    # Use Primitive.io_thread_buffer_allocate(Primitive.pointer_find_type_size(:type) * n)
+    # instead for a single pointer. This method always returns an Array of FFI::Pointer.
     def self.stack_alloc(*args)
       total_length = 0
       offsets = []
-      args.each_slice(2) do |type, count|
-        type_size = case type
-                    when nil
-                      1
-                    when Integer
-                      type
-                    when Symbol
-                      Pointer.find_type_size(type)
-                    else
-                      type.size
-                    end
-        length = (type_size * count)
+      args.each do |length|
+        unless Primitive.object_kind_of?(length, Integer)
+          raise ArgumentError, "incorrect pointer type: #{length.inspect}"
+        end
         offsets << [total_length, length]
         total_length += length
       end
       buffer = Primitive.io_thread_buffer_allocate(total_length)
-      pointers = offsets.map { |offset, length| buffer.slice(offset, length) }
-      pointers.size == 1 ? pointers[0] : pointers
+      offsets.map { |offset, length| buffer.slice(offset, length) }
     end
 
+    # The argument is the first pointer returned by #stack_alloc
     def self.stack_free(pointer)
       Primitive.io_thread_buffer_free(pointer)
     end

src/main/ruby/truffleruby/core/truffle/io_operations.rb

@@ -137,7 +137,7 @@ def self.select(readables, readable_ios, writables, writable_ios, errorables, er
       end
 
       readables_pointer, writables_pointer, errorables_pointer =
-          Truffle::FFI::Pool.stack_alloc(:int, readables.size, :int, writables.size, :int, errorables.size)
+          Truffle::FFI::Pool.stack_alloc(readables.size * SIZEOF_INT, writables.size * SIZEOF_INT, errorables.size * SIZEOF_INT)
 
       begin
         to_fds(readable_ios, readables_pointer)