polyphony 0.42 → 0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e284cae2a5eb2332bc8671090412bbe0cf7d57dbc163d68ba387f4d9635a8adf
-  data.tar.gz: 58eba5a2607df83c7471b1a6b72cc350aa468e9a562e3d1e8f7451eaae12d068
+  metadata.gz: 4eb88a97bf07f85f50aa46923883fce2fe1bbd253407021a6f5bb246e0fdcfdc
+  data.tar.gz: c707861eb93f709661aa90abb33519004df5ff5db16f2d3da00387b292234027
 SHA512:
-  metadata.gz: 10b7bcf9240ea8f7355c75d025bd6c5e1bd00c86e7985f71440091cc149c629279b16eaf1c863d85de29e278739926b499625c77238db8eb803aa235395771a4
-  data.tar.gz: 9001df441fdc058a3234bca05f6cca55d3a27edcf0b5b0d126a9c371d37bd0ffecc4d13d8f13c614d9b7182630f94d54481035f6d83fb044aebdf3238f83b03a
+  metadata.gz: b554716ed26188fec86606198cdca669253d921017748ef0d9231db9f01e08e046b62fc38c0c6c3595a42f1976771db8b42c352c0431cc73f4b1ed64f7edf3c9
+  data.tar.gz: 3ba74e7427fab47a65cd466e9bbe14e48176f737f6fd7fca21b3143d75d1dd9fa2ddef24b723d83f26f321949171359d946cfd4281b3b96c33bf43593199adce

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.43 2020-07-05
+
+* Add IO#read_loop
+* Fix OpenSSL extension
+* More work on docs
+
 ## 0.42 2020-07-03
 
 * Improve documentation

data/Gemfile.lock

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

data/TODO.md

@@ -1,11 +1,10 @@
-## 0.42
+## 0.43 
 
 - Reimplement ResourcePool, Channel, Mutex using LibevQueue
 -- Add `Fiber#schedule_with_priority` method, aliased by `Fiber#wakeup`
 - Implement agent interface is virtual function table
 - Implement proxy agent for plugging in a user-provided agent class
 
-## 0.43 
 - Debugging
   - Eat your own dogfood: need a good tool to check what's going on when some
     test fails

data/docs/_config.yml

@@ -46,13 +46,13 @@ heading_anchors: true
 back_to_top: true
 back_to_top_text: "Back to top"
 
-footer_content: "Copyright &copy; 2018-2020 Sharon Rosner. Distributed by an <a href=\"https://github.com/digital-fabric/polyphony/tree/master/LICENSE.txt\">MIT license.</a>"
+footer_content: "Copyright &copy; 2020 Sharon Rosner. Distributed by an <a href=\"https://github.com/digital-fabric/polyphony/tree/master/LICENSE\">MIT license.</a>"
 
 # Footer "Edit this page on GitHub" link text
 gh_edit_link: true # show or hide edit this page link
 gh_edit_link_text: "Edit this page on GitHub"
 gh_edit_repository: "https://github.com/digital-fabric/polyphony" # the github URL for your repo
-gh_edit_branch: "master" # the branch that your docs is served from
+gh_edit_branch: "master/docs" # the branch that your docs is served from
 gh_edit_view_mode: "tree" # "tree" or "edit" if you want the user to jump into the editor immediately
 
 compress_html:

data/docs/getting-started/overview.md

@@ -416,28 +416,7 @@ request handler after all request headers have been received. This allows the
 application to better deal with slow client attacks, big file uploads, and also
 to minimize costly memory allocation and GC'ing.
 
-Preliminary benchmarks show the Polyphony web server to be about 3X as fast as
-Puma and 20X as fast as Unicorn. With SSL termination and using HTTP 2, the
-Polyphony web server is about 2X as fast as Falcon.
-
-### HTTP/1
-
-|Server|requests/sec|average latency|max latency|
-|------|-----------:|--------------:|----------:|
-|Puma|
-|Unicorn|
-|Agoo|
-|Polyphony|
-
-### HTTP/2 with SSL Termination
-
-|Server|requests/sec|average latency|max latency|
-|------|-----------:|--------------:|----------:|
-|Falcon|
-|Polyphony|
-
-(*Non-official benchmark with a basic "Hello world" Rack application. The usual
-caveats regarding benchmarks should be applied here.*)
+Benchmarks will be included here at a later time.
 
 ## Integrating Polyphony with other Gems
 

data/examples/performance/thread-vs-fiber/polyphony_server_read_loop.rb

@@ -13,7 +13,7 @@ def handle_client(socket)
   parser.on_message_complete = proc do |env|
     reqs << Object.new # parser
   end
-  Thread.current.agent.read_loop(socket) do |data|
+  socket.read_loop do |data|
     parser << data
     while (req = reqs.shift)
       handle_request(socket, req)

data/lib/polyphony/extensions/io.rb

@@ -201,6 +201,10 @@ class ::IO
     buf ? readpartial(maxlen, buf) : readpartial(maxlen)
   end
 
+  def read_loop(&block)
+    Thread.current.agent.read_loop(self, &block)
+  end
+
   # alias_method :orig_read, :read
   # def read(length = nil, outbuf = nil)
   #   if length

data/lib/polyphony/extensions/openssl.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'openssl'
-
 require_relative './socket'
 
 # Open ssl socket helper methods (to make it compatible with Socket API)
@@ -18,12 +17,36 @@ class ::OpenSSL::SSL::SSLSocket
     io.reuse_addr
   end
 
-  def sysread(maxlen, buf)
+  alias_method :orig_accept, :accept
+  def accept
+    loop do
+      result = accept_nonblock(exception: false)
+      case result
+      when :wait_readable then Thread.current.agent.wait_io(io, false)
+      when :wait_writable then Thread.current.agent.wait_io(io, true)
+      else
+        return result
+      end
+    end
+  end
+
+  alias_method :orig_sysread, :sysread
+  def sysread(maxlen, buf = +'')
     loop do
       case (result = read_nonblock(maxlen, buf, exception: false))
       when :wait_readable then Thread.current.agent.wait_io(io, false)
+      else return result
+      end
+    end
+  end
+
+  alias_method :orig_syswrite, :syswrite
+  def syswrite(buf)
+    loop do
+      case (result = write_nonblock(buf, exception: false))
       when :wait_writable then Thread.current.agent.wait_io(io, true)
-      else result
+      else
+        return result
       end
     end
   end
@@ -37,13 +60,14 @@ class ::OpenSSL::SSL::SSLSocket
     # @sync = osync
   end
 
-  def syswrite(buf)
-    loop do
-      case (result = write_nonblock(buf, exception: false))
-      when :wait_readable then Thread.current.agent.wait_io(io, false)
-      when :wait_writable then Thread.current.agent.wait_io(io, true)
-      else result
-      end
+  def readpartial(maxlen, buf = +'')
+    result = sysread(maxlen, buf)
+    result || (raise EOFError)
+  end
+
+  def read_loop
+    while (data = sysread(8192))
+      yield data
     end
   end
 end

data/lib/polyphony/version.rb

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

data/test/test_socket.rb

@@ -8,7 +8,8 @@ class SocketTest < MiniTest::Test
   end
 
   def test_tcp
-    server = TCPServer.new('127.0.0.1', 1234)
+    port = rand(1234..5678)
+    server = TCPServer.new('127.0.0.1', port)
 
     server_fiber = spin do
       while (socket = server.accept)
@@ -21,13 +22,13 @@ class SocketTest < MiniTest::Test
     end
 
     snooze
-    client = TCPSocket.new('127.0.0.1', 1234)
+    client = TCPSocket.new('127.0.0.1', port)
     client.write("1234\n")
     assert_equal "1234\n", client.readpartial(8192)
     client.close
   ensure
-    server_fiber.stop
-    snooze
+    server_fiber&.stop
+    server_fiber&.await
     server&.close
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.42'
+  version: '0.43'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty