polyphony 0.41 → 0.43.3

data/lib/polyphony/extensions/fiber.rb

@@ -370,15 +370,3 @@ class ::Fiber
 end
 
 Fiber.current.setup_main_fiber
-
-# This at_exit handler is needed only when the original process exits. Due to
-# the behaviour of fibers on fork (and especially on exit from forked
-# processes,) we use a separate mechanism to terminate fibers in forked
-# processes (see Polyphony.fork).
-orig_pid = Process.pid
-at_exit do
-  next unless orig_pid == Process.pid
-
-  Polyphony.terminate_threads
-  Fiber.current.shutdown_all_children
-end

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/extensions/socket.rb

@@ -128,11 +128,11 @@ class ::TCPServer
 
   alias_method :orig_accept, :accept
   def accept
-    @io ? @io.accept : orig_accept
+    @io.accept
   end
 
   alias_method :orig_close, :close
   def close
-    @io ? @io.close : orig_close
+    @io.close
   end
 end

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'jekyll',               '~>3.8.6'
   s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'
   s.add_development_dependency  'jekyll-seo-tag',       '~>2.6.1'
-  s.add_development_dependency  'just-the-docs',        '~>0.2.7'
+  s.add_development_dependency  'just-the-docs',        '~>0.3.0'
 end

data/test/test_agent.rb

@@ -5,11 +5,14 @@ require_relative 'helper'
 class AgentTest < MiniTest::Test
   def setup
     super
+    @prev_agent = Thread.current.agent
     @agent = Polyphony::LibevAgent.new
+    Thread.current.agent = @agent
   end
 
   def teardown
     @agent.finalize
+    Thread.current.agent = @prev_agent
   end
 
   def test_sleep
@@ -18,10 +21,13 @@ class AgentTest < MiniTest::Test
     spin {
       @agent.sleep 0.01
       count += 1
-    }
-    suspend
-    assert Time.now - t0 >= 0.01
-    assert_equal 1, count
+      @agent.sleep 0.01
+      count += 1
+      @agent.sleep 0.01
+      count += 1
+    }.await
+    assert Time.now - t0 >= 0.03
+    assert_equal 3, count
   end
 
   def test_write_read_partial
@@ -67,11 +73,58 @@ class AgentTest < MiniTest::Test
 
   def test_waitpid
     pid = fork do
-      Thread.current.agent.post_fork
+      @agent.post_fork
       exit(42)
     end
     
-    result = Thread.current.agent.waitpid(pid)
+    result = @agent.waitpid(pid)
     assert_equal [pid, 42], result
   end
+
+  def test_read_loop
+    i, o = IO.pipe
+
+    buf = []
+    spin do
+      buf << :ready
+      @agent.read_loop(i) { |d| buf << d }
+      buf << :done
+    end
+
+    # writing always causes snoozing
+    o << 'foo'
+    o << 'bar'
+    o.close
+
+    # read_loop will snooze after every read
+    4.times { snooze }
+
+    assert_equal [:ready, 'foo', 'bar', :done], buf
+  end
+
+  def test_accept_loop
+    server = TCPServer.new('127.0.0.1', 1234)
+
+    clients = []
+    server_fiber = spin do
+      @agent.accept_loop(server) { |c| clients << c }
+    end
+
+    c1 = TCPSocket.new('127.0.0.1', 1234)
+    10.times { snooze }
+
+    assert_equal 1, clients.size
+
+    c2 = TCPSocket.new('127.0.0.1', 1234)
+    10.times { snooze }
+
+    assert_equal 2, clients.size
+
+  ensure
+    c1&.close
+    c2&.close
+    server_fiber.stop
+    snooze
+    server&.close
+  end
 end

data/test/test_fiber.rb

@@ -482,9 +482,9 @@ class FiberTest < MiniTest::Test
   def test_select_from_multiple_fibers
     sleep 0
     buffer = []
-    f1 = spin { sleep 0.01; buffer << :foo; :foo }
-    f2 = spin { sleep 0.03; buffer << :bar; :bar }
-    f3 = spin { sleep 0.05; buffer << :baz; :baz }
+    f1 = spin { sleep 0.1; buffer << :foo; :foo }
+    f2 = spin { sleep 0.3; buffer << :bar; :bar }
+    f3 = spin { sleep 0.5; buffer << :baz; :baz }
 
     selected, result = Fiber.select(f1, f2, f3)
     assert_equal :foo, result

data/test/test_global_api.rb

@@ -106,7 +106,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.03
+    assert t1 - t0 < 0.1
     assert_nil v
   end
 
@@ -118,7 +118,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
     assert_equal :bar, v
   end
 
@@ -129,7 +129,7 @@ class MoveOnAfterTest < MiniTest::Test
     assert_equal Fiber.current, f.parent
     v = sleep 1
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
     assert_equal 'foo', v
   end
 end
@@ -145,7 +145,7 @@ class CancelAfterTest < MiniTest::Test
       end
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
   end
 
   def test_cancel_after_without_block
@@ -157,7 +157,31 @@ class CancelAfterTest < MiniTest::Test
       sleep 1
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
+  end
+
+  class CustomException < Exception
+  end
+
+  def test_cancel_after_with_custom_exception
+    assert_raises CustomException do
+      cancel_after(0.01, with_exception: CustomException) do
+        sleep 1
+        :foo
+      end
+    end
+
+    begin
+      e = nil
+      cancel_after(0.01, with_exception: 'foo') do
+        sleep 1
+        :foo
+      end
+    rescue => e
+    ensure
+      assert_kind_of RuntimeError, e
+      assert_equal 'foo', e.message
+    end
   end
 end
 
@@ -201,10 +225,13 @@ class SpinLoopTest < MiniTest::Test
   def test_spin_loop_with_rate
     buffer = []
     counter = 0
-    f = spin_loop(rate: 50) { buffer << (counter += 1) }
+    t0 = Time.now
+    f = spin_loop(rate: 10) { buffer << (counter += 1) }
     sleep 0.2
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 end
 
@@ -212,12 +239,15 @@ class ThrottledLoopTest < MiniTest::Test
   def test_throttled_loop
     buffer = []
     counter = 0
+    t0 = Time.now
     f = spin do
-      throttled_loop(50) { buffer << (counter += 1) }
+      throttled_loop(10) { buffer << (counter += 1) }
     end
-    sleep 0.2
+    sleep 0.3
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 
   def test_throttled_loop_with_count
@@ -243,19 +273,22 @@ class GlobalAPIEtcTest < MiniTest::Test
 
   def test_every
     buffer = []
+    t0 = Time.now
     f = spin do
-      every(0.01) { buffer << 1 }
+      every(0.1) { buffer << 1 }
     end
-    sleep 0.05
+    sleep 0.5
     f.stop
-    assert (4..5).include?(buffer.size)
+    elapsed = Time.now - t0
+    expected = (elapsed / 0.1).to_i
+    assert buffer.size >= expected - 2 && buffer.size <= expected + 2
   end
 
   def test_sleep
     t0 = Time.now
-    sleep 0.05
+    sleep 0.1
     elapsed = Time.now - t0
-    assert (0.045..0.08).include? elapsed
+    assert (0.05..0.15).include? elapsed
 
     f = spin { sleep }
     snooze

data/test/test_resource_pool.rb

@@ -123,4 +123,16 @@ class ResourcePoolTest < MiniTest::Test
     pool.preheat!
     assert_equal 2, pool.size
   end
+
+  def test_reentrant_resource_pool
+    resources = [+'a', +'b']
+    pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
+
+    pool.acquire do |r|
+      assert_equal 'a', r
+      pool.acquire do |r|
+        assert_equal 'a', r
+      end
+    end
+  end
 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

data/test/test_throttler.rb

@@ -4,14 +4,15 @@ require_relative 'helper'
 
 class ThrottlerTest < MiniTest::Test
   def test_throttler_with_rate
-    t = Polyphony::Throttler.new(100)
+    t = Polyphony::Throttler.new(10)
     buffer = []
+    t0 = Time.now
     f = spin { loop { t.process { buffer << 1 } } }
-    sleep 0.02
+    sleep 0.2
     f.stop
-    snooze
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert buffer.size >= expected - 1 && buffer.size <= expected + 1
   ensure
     t.stop
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.41'
+  version: 0.43.3
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.0
 description: 
 email: ciconia@gmail.com
 executables: []
@@ -242,20 +242,14 @@ files:
 - TODO.md
 - bin/polyphony-debug
 - docs/_config.yml
-- docs/_includes/head.html
-- docs/_includes/nav.html
-- docs/_includes/prevnext.html
-- docs/_layouts/default.html
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
-- docs/api-reference.md
+- docs/_user-guide/all-about-timers.md
+- docs/_user-guide/index.md
+- docs/_user-guide/web-server.md
 - docs/api-reference/exception.md
 - docs/api-reference/fiber.md
-- docs/api-reference/gyro-async.md
-- docs/api-reference/gyro-child.md
-- docs/api-reference/gyro-queue.md
-- docs/api-reference/gyro-timer.md
-- docs/api-reference/gyro.md
+- docs/api-reference/index.md
 - docs/api-reference/io.md
 - docs/api-reference/object.md
 - docs/api-reference/polyphony-baseexception.md
@@ -273,23 +267,25 @@ files:
 - docs/assets/img/echo-fibers.svg
 - docs/assets/img/sleeping-fiber.svg
 - docs/faq.md
-- docs/getting-started.md
+- docs/favicon.ico
+- docs/getting-started/index.md
 - docs/getting-started/installing.md
+- docs/getting-started/overview.md
 - docs/getting-started/tutorial.md
 - docs/index.md
-- docs/main-concepts.md
 - docs/main-concepts/concurrency.md
 - docs/main-concepts/design-principles.md
 - docs/main-concepts/exception-handling.md
 - docs/main-concepts/extending.md
 - docs/main-concepts/fiber-scheduling.md
-- docs/user-guide.md
-- docs/user-guide/all-about-timers.md
-- docs/user-guide/web-server.md
+- docs/main-concepts/index.md
+- docs/polyphony-logo.png
+- examples/adapters/concurrent-ruby.rb
 - examples/adapters/pg_client.rb
 - examples/adapters/pg_notify.rb
 - examples/adapters/pg_pool.rb
 - examples/adapters/pg_transaction.rb
+- examples/adapters/redis_blpop.rb
 - examples/adapters/redis_channels.rb
 - examples/adapters/redis_client.rb
 - examples/adapters/redis_pubsub.rb
@@ -297,11 +293,12 @@ files:
 - examples/core/01-spinning-up-fibers.rb
 - examples/core/02-awaiting-fibers.rb
 - examples/core/03-interrupting.rb
-- examples/core/forever_sleep.rb
+- examples/core/04-handling-signals.rb
 - examples/core/xx-agent.rb
 - examples/core/xx-at_exit.rb
 - examples/core/xx-caller.rb
 - examples/core/xx-channels.rb
+- examples/core/xx-daemon.rb
 - examples/core/xx-deadlock.rb
 - examples/core/xx-deferring-an-operation.rb
 - examples/core/xx-erlang-style-genserver.rb
@@ -361,10 +358,14 @@ files:
 - examples/performance/snooze_raw.rb
 - examples/performance/thread-vs-fiber/polyphony_mt_server.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
+- examples/performance/thread-vs-fiber/polyphony_server_read_loop.rb
 - examples/performance/thread-vs-fiber/threaded_server.rb
 - examples/performance/thread-vs-fiber/xx-httparty_multi.rb
 - examples/performance/thread-vs-fiber/xx-httparty_threaded.rb
 - examples/performance/thread_pool_perf.rb
+- examples/performance/xx-array.rb
+- examples/performance/xx-fiber-switch.rb
+- examples/performance/xx-snooze.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
@@ -390,7 +391,6 @@ files:
 - ext/polyphony/polyphony.c
 - ext/polyphony/polyphony.h
 - ext/polyphony/polyphony_ext.c
-- ext/polyphony/socket.c
 - ext/polyphony/thread.c
 - ext/polyphony/tracing.c
 - lib/polyphony.rb