[GR-18163] Coerce to String for BasicSocket#send and support buffer for UDPSocket#recvfrom_nonblock (#2209)

PullRequest: truffleruby/2338

Author: eregon

CHANGELOG.md

@@ -36,6 +36,8 @@ Compatibility:
 * Make rand work with exclusive range with Float (#1506, @gogainda)
 * Fixed `String#dump`'s formatting of escaped unicode characters (#2217, @meganniu).
 * Switched to the io-console C extension from C ruby for better performance and compatibility in `irb`.
+* Coerce the message to a `String` for `BasicSocket#send` (#2209, @HoneyryderChuck).
+* Support buffer argument for `UDPSocket#recvfrom_nonblock` (#2209, @HoneyryderChuck).
 
 Performance:
 

lib/truffle/socket/basic_socket.rb

@@ -121,6 +121,7 @@ def getpeername
   end
 
   def send(message, flags, dest_sockaddr = nil)
+    message    = StringValue(message)
     bytes      = message.bytesize
     bytes_sent = 0
 
@@ -153,8 +154,6 @@ def send(message, flags, dest_sockaddr = nil)
   end
 
   private def internal_recv(bytes_to_read, flags, buffer, exception)
-    raise ArgumentError, 'buffer argument not yet supported' if buffer
-
     Truffle::Socket::Foreign.memory_pointer(bytes_to_read) do |buf|
       n_bytes = Truffle::Socket::Foreign.recv(Primitive.io_fd(self), buf, bytes_to_read, flags)
 
@@ -166,7 +165,8 @@ def send(message, flags, dest_sockaddr = nil)
         end
       end
 
-      return buf.read_string(n_bytes)
+      str = buf.read_string(n_bytes)
+      buffer ? buffer.replace(str) : str
     end
   end
 

lib/truffle/socket/ip_socket.rb

@@ -39,7 +39,7 @@ def peeraddr(reverse_lookup=nil)
     Truffle::Socket.address_info(:getpeername, self, reverse_lookup)
   end
 
-  private def internal_recvfrom(maxlen, flags, exception)
+  private def internal_recvfrom(maxlen, flags, buffer, exception)
     message, addr = internal_recvmsg(maxlen, flags, nil, false, exception)
 
     return message if message == :wait_readable
@@ -58,11 +58,13 @@ def peeraddr(reverse_lookup=nil)
       end
     end
 
+    message = buffer.replace(message) if buffer
+
     [message, [aname, addr.ip_port, hostname, addr.ip_address]]
   end
 
   def recvfrom(maxlen, flags = 0)
     flags = 0 if flags.nil?
-    internal_recvfrom(maxlen, flags, true)
+    internal_recvfrom(maxlen, flags, nil, true)
   end
 end

lib/truffle/socket/udp_socket.rb

@@ -73,12 +73,12 @@ def send(message, flags, host = nil, port = nil)
     super(message, flags, addr)
   end
 
-  def recvfrom_nonblock(maxlen, flags = 0, exception: true)
+  def recvfrom_nonblock(maxlen, flags = 0, buffer = nil, exception: true)
     fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
 
     flags = 0 if flags.nil?
 
-    internal_recvfrom(maxlen, flags | Socket::MSG_DONTWAIT, exception)
+    internal_recvfrom(maxlen, flags | Socket::MSG_DONTWAIT, buffer, exception)
   end
 
   def inspect

spec/ruby/library/socket/basicsocket/send_spec.rb

@@ -99,6 +99,14 @@
         @server.close
       end
 
+      describe 'with an object implementing #to_str' do
+        it 'returns the amount of sent bytes' do
+          data = mock('message')
+          data.should_receive(:to_str).and_return('hello')
+          @client.send(data, 0, @server.getsockname).should == 5
+        end
+      end
+
       describe 'without a destination address' do
         it "raises #{SocketSpecs.dest_addr_req_error}" do
           -> { @client.send('hello', 0) }.should raise_error(SocketSpecs.dest_addr_req_error)