polyphony 0.62 → 0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cea172818871812ebbafcbee0a4b98d130a351f904d7732a02400ef363eac62
-  data.tar.gz: f4ef85515436a463d3732f04bbef457426f267fac01f5c5c28619e42334cd745
+  metadata.gz: b2c69a05b391ebc688550a3894e56362de6603d04e807cad3072dfdffe966787
+  data.tar.gz: c09da8e0cb9e04eb4ea964e81cdd75a735f9e2f08f882ddaec8f2bee4be5661b
 SHA512:
-  metadata.gz: 489b813f1bb2d7d97f87a60024b0665761571c4227e4fab6c733dcdb62b6ee98760473202c9154eb39a4b544663f759e4da6e70603d483e9f2ec2a64363cd4e1
-  data.tar.gz: 05b232d7d67120e0983e60855c928beac6e91271fafc87586da7cc7543128fe326be04d126154ac7e0b0c0b249bf41ca90ab902f79f4a5fbf00cad498061f7e7
+  metadata.gz: cbd89d448e06cc80a105ab763b21b62054eb7ee4a21b8b115954765e80170d55a99b4a314695554493d81cbd73f87941846521a4b0dcac9d1653bcb8a51497f6
+  data.tar.gz: 6fc94352edc156fb963a4f74180208353ecd8cae82ffef1c6ac02b6413870ba028a5cea547dcdebb5bb3998b73a5529de209c035ae32ec7d4500678b3a7f7b65

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.63 2021-07-26
+
+- Add support for specifying buf and buf_pos in `IO#read`
+- Fix `Socket#read` to work and conform to `IO#read` interface
+
 ## 0.62 2021-07-21
 
 - Add `runqueue_size` to backend stats

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.62)
+    polyphony (0.63)
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -9,8 +9,8 @@ Rake::ExtensionTask.new("polyphony_ext") do |ext|
 end
 
 task :recompile => [:clean, :compile]
-
 task :default => [:compile, :test]
+
 task :test do
   exec 'ruby test/run.rb'
 end

data/lib/polyphony/extensions/io.rb

@@ -108,7 +108,11 @@ class ::IO
   end
 
   alias_method :orig_read, :read
-  def read(len = nil)
+  def read(len = nil, buf = nil, buf_pos = 0)
+    if buf
+      return Polyphony.backend_read(self, buf, len, true, buf_pos)
+    end
+    
     @read_buffer ||= +''
     result = Polyphony.backend_read(self, @read_buffer, len, true, -1)
     return nil unless result

data/lib/polyphony/extensions/openssl.rb

@@ -64,6 +64,20 @@ class ::OpenSSL::SSL::SSLSocket
     # @sync = osync
   end
 
+  alias_method :orig_read, :read
+  def read(maxlen = nil, buf = nil, buf_pos = 0)
+    return readpartial(maxlen, buf, buf_pos) if buf
+
+    buf = +''
+    return readpartial(maxlen, buf) if maxlen
+
+    while true
+      readpartial(4096, buf, -1)
+    end
+  rescue EOFError
+    buf
+  end
+
   def readpartial(maxlen, buf = +'', buffer_pos = 0)
     if buffer_pos != 0
       if (result = sysread(maxlen, +''))

data/lib/polyphony/extensions/socket.rb

@@ -22,6 +22,23 @@ class ::Socket
     Polyphony.backend_connect(self, addr.ip_address, addr.ip_port)
   end
 
+  alias_method :orig_read, :read
+  def read(maxlen = nil, buf = nil, buf_pos = 0)
+    return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
+    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    
+    buf = +''
+    len = buf.bytesize
+    while true
+      Polyphony.backend_recv(self, buf, maxlen || 4096, -1)
+      new_len = buf.bytesize
+      break if new_len == len
+
+      len = new_len
+    end
+    buf
+  end
+
   def recv(maxlen, flags = 0, outbuf = nil)
     Polyphony.backend_recv(self, outbuf || +'', maxlen, 0)
   end
@@ -140,6 +157,23 @@ class ::TCPSocket
     setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, 1)
   end
 
+  alias_method :orig_read, :read
+  def read(maxlen = nil, buf = nil, buf_pos = 0)
+    return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
+    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    
+    buf = +''
+    len = buf.bytesize
+    while true
+      Polyphony.backend_recv(self, buf, maxlen || 4096, -1)
+      new_len = buf.bytesize
+      break if new_len == len
+
+      len = new_len
+    end
+    buf
+  end
+
   def recv(maxlen, flags = 0, outbuf = nil)
     Polyphony.backend_recv(self, outbuf || +'', maxlen, 0)
   end
@@ -217,6 +251,23 @@ class ::UNIXServer
 end
 
 class ::UNIXSocket
+  alias_method :orig_read, :read
+  def read(maxlen = nil, buf = nil, buf_pos = 0)
+    return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
+    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    
+    buf = +''
+    len = buf.bytesize
+    while true
+      Polyphony.backend_recv(self, buf, maxlen || 4096, -1)
+      new_len = buf.bytesize
+      break if new_len == len
+
+      len = new_len
+    end
+    buf
+  end
+
   def recv(maxlen, flags = 0, outbuf = nil)
     Polyphony.backend_recv(self, outbuf || +'', maxlen, 0)
   end

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.62'
+  VERSION = '0.63'
 end

data/test/test_backend.rb

@@ -98,6 +98,32 @@ class BackendTest < MiniTest::Test
     assert_equal return_value, buf
   end
 
+  def test_read_concat_big
+    i, o = IO.pipe
+
+    body = " " * 4000
+
+    data = "post /?q=time&blah=blah HTTP/1\r\nHost: dev.realiteq.net\r\n\r\n" +
+           "get /?q=time HTTP/1.1\r\nContent-Length: #{body.bytesize}\r\n\r\n#{body}" +
+           "get /?q=time HTTP/1.1\r\nCookie: foo\r\nCookie: bar\r\n\r\n"
+
+    o << data
+    o.close
+    
+    buf = +''
+
+    @backend.read(i, buf, 4096, false, -1)
+    assert_equal 4096, buf.bytesize
+    
+    @backend.read(i, buf, 1, false, -1)
+    assert_equal 4097, buf.bytesize
+
+    @backend.read(i, buf, 4096, false, -1)
+
+    assert_equal data.bytesize, buf.bytesize
+    assert_equal data, buf
+  end
+
   def test_waitpid
     pid = fork do
       @backend.post_fork

data/test/test_io.rb

@@ -73,6 +73,26 @@ class IOTest < MiniTest::Test
     assert_equal [:wait_readable, 'foo'], results
   end
 
+  def test_read
+    i, o = IO.pipe
+
+    o << 'hi'
+    assert_equal 'hi', i.read(2)
+
+    o << 'foobarbaz'
+    assert_equal 'foo', i.read(3)
+    assert_equal 'bar', i.read(3)
+
+    buf = +'abc'
+    assert_equal 'baz', i.read(3, buf)
+    assert_equal 'baz', buf
+
+    buf = +'def'
+    o << 'foobar'
+    assert_equal 'deffoobar', i.read(6, buf, -1)
+    assert_equal 'deffoobar', buf
+  end
+
   def test_readpartial
     i, o = IO.pipe
 

data/test/test_socket.rb

@@ -12,7 +12,6 @@ class SocketTest < MiniTest::Test
   def test_tcp
     port = rand(1234..5678)
     server = TCPServer.new('127.0.0.1', port)
-
     server_fiber = spin do
       while (socket = server.accept)
         spin do
@@ -34,6 +33,45 @@ class SocketTest < MiniTest::Test
     server&.close
   end
 
+  def test_read
+    port = rand(1234..5678)
+    server = TCPServer.new('127.0.0.1', port)
+    server_fiber = spin do
+      while (socket = server.accept)
+        spin do
+          while (data = socket.read(8192))
+            socket << data
+          end
+        end
+      end
+    end
+
+    snooze
+    client = TCPSocket.new('127.0.0.1', port)
+
+    client << 'hi'
+    assert_equal 'hi', client.read(2)
+
+    client << 'foobarbaz'
+    assert_equal 'foo', client.read(3)
+    assert_equal 'bar', client.read(3)
+
+    buf = +'abc'
+    assert_equal 'baz', client.read(3, buf)
+    assert_equal 'baz', buf
+
+    buf = +'def'
+    client << 'foobar'
+    assert_equal 'deffoobar', client.read(6, buf, -1)
+    assert_equal 'deffoobar', buf
+
+    client.close
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    server&.close
+  end
+
   # sending multiple strings at once
   def test_sendv
     port = rand(1234..5678)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.62'
+  version: '0.63'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler