polyphony 0.43.2 → 0.43.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7cf8c345b125c9a41ca7c0ad025ac21d001fc1f73dedb0b4968e426a096d8b6
-  data.tar.gz: 23b828449792dc3887c75ad54da3451696de66f6aceee255d8a1a5e9489bdf90
+  metadata.gz: f48ef7d009af377b337388a1cca2eb4fe16b85deb1f37076fcd40e010aa9c0e3
+  data.tar.gz: 7b4fa6e8951dc52fd3fdcc9b5a2f1974155e2b709d71de593657374de5020c88
 SHA512:
-  metadata.gz: a35a60f273a1989d31155a0d9c6d0a3685794dc363cb60fbf77cce4f8d4f15f7c16c6489d63d4534dc20b281fe0a9aa65f036ffa478e689d119679db48d7a52f
-  data.tar.gz: 8de219230c3a1ae3a6c7b618d271a58c54abe8ab5208a338e935c823056b6edebf6d311b4d90748ca9aad238f6b67643a3ac71036a60700920859bcffde56acd
+  metadata.gz: 8de0f7526767acef9487417efb79c528312905adc4daed2664e8781ddfffa82118812407c2632269f8c6df0ba91733723804bad027e67cd5094aa1855241d8b4
+  data.tar.gz: 94f5f80ec12f9fba315ce76495f7792125190a2e2004b455a79d58912cac523cd07f90f62218823126023a4003e4f08281676d899737f30d271d5c981f191d04

data/.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
         ruby: [2.6, 2.7]
 
     name: >-

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.43.3 2020-07-08
+
+* Fix behaviour after call to `Process.daemon` (#8)
+* Replace core `Queue` class with `Polyphony::Queue` (#22)
+* Make `ResourcePool` reentrant (#1)
+* Accept `:with_exception` argument in `cancel_after` (#16)
+
 ## 0.43.2 2020-07-07
 
 * Fix sending Redis commands with array arguments (#21)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.43.2)
+    polyphony (0.43.3)
 
 GEM
   remote: https://rubygems.org/
@@ -12,7 +12,7 @@ GEM
     ast (2.4.0)
     builder (3.2.4)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     docile (1.3.2)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)

data/examples/adapters/concurrent-ruby.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'concurrent'
+
+puts "Hello, concurrent-ruby"
+
+# this program should not hang with concurrent-ruby 1.1.6 (see issue #22)

data/examples/core/xx-daemon.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+Exception.__disable_sanitized_backtrace__ = true
+
+puts "pid: #{Process.pid}"
+
+Process.daemon(true, true)
+
+Polyphony::ThreadPool.process do
+  puts "Hello world from pid #{Process.pid}"
+end

data/lib/polyphony.rb

@@ -6,6 +6,12 @@ require_relative './polyphony_ext'
 module Polyphony
   # Map Queue to Libev queue implementation
   Queue = LibevQueue
+
+  # replace core Queue class with our own
+  verbose = $VERBOSE
+  $VERBOSE = nil
+  Object.const_set(:Queue, Polyphony::Queue)
+  $VERBOSE = verbose
 end
 
 require_relative './polyphony/extensions/core'
@@ -114,7 +120,25 @@ module Polyphony
       threads.each(&:kill)
       threads.each(&:join)
     end
+
+    attr_accessor :original_pid
+
+    def install_at_exit_handler
+      @original_pid = ::Process.pid
+
+      # 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).
+      at_exit do
+        next unless @original_pid == ::Process.pid
+      
+        Polyphony.terminate_threads
+        Fiber.current.shutdown_all_children
+      end
+    end
   end
 end
 
 Polyphony.install_terminating_signal_handlers
+Polyphony.install_at_exit_handler

data/lib/polyphony/core/global_api.rb

@@ -15,11 +15,13 @@ module Polyphony
       end
     end
 
-    def cancel_after(interval, &block)
+    def cancel_after(interval, with_exception: Polyphony::Cancel, &block)
       fiber = ::Fiber.current
       canceller = spin do
         sleep interval
-        fiber.schedule Polyphony::Cancel.new
+        exception = with_exception.is_a?(Class) ?
+          with_exception.new : RuntimeError.new(with_exception)
+        fiber.schedule exception
       end
       block ? cancel_after_wrap_block(canceller, &block) : canceller
     end

data/lib/polyphony/core/resource_pool.rb

@@ -13,6 +13,7 @@ module Polyphony
 
       @stock = []
       @queue = []
+      @acquired_resources = {}
 
       @limit = opts[:limit] || 4
       @size = 0
@@ -23,16 +24,25 @@ module Polyphony
     end
 
     def acquire
-      Thread.current.agent.ref
-      resource = wait_for_resource
-      return unless resource
-
-      yield resource
-    ensure
-      Thread.current.agent.unref
-      release(resource) if resource
+      fiber = Fiber.current
+      if @acquired_resources[fiber]
+        yield @acquired_resources[fiber]
+      else
+        begin
+          Thread.current.agent.ref
+          resource = wait_for_resource
+          return unless resource
+          
+          @acquired_resources[fiber] = resource
+          yield resource
+        ensure
+          @acquired_resources[fiber] = nil
+          Thread.current.agent.unref
+          release(resource) if resource
+        end
+      end
     end
-
+        
     def wait_for_resource
       fiber = Fiber.current
       @queue << fiber

data/lib/polyphony/extensions/core.rb

@@ -57,6 +57,12 @@ module ::Process
       fiber.define_singleton_method(:pid) { pid }
       fiber
     end
+
+    alias_method :orig_daemon, :daemon
+    def daemon(*args)
+      orig_daemon(*args)
+      Polyphony.original_pid = Process.pid
+    end
   end
 end
 

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/version.rb

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

data/test/test_agent.rb

@@ -111,12 +111,12 @@ class AgentTest < MiniTest::Test
     end
 
     c1 = TCPSocket.new('127.0.0.1', 1234)
-    snooze
+    10.times { snooze }
 
     assert_equal 1, clients.size
 
     c2 = TCPSocket.new('127.0.0.1', 1234)
-    2.times { snooze }
+    10.times { snooze }
 
     assert_equal 2, clients.size
 

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
@@ -159,6 +159,30 @@ class CancelAfterTest < MiniTest::Test
     t1 = Time.now
     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_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.43.2
+  version: 0.43.3
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -280,6 +280,7 @@ files:
 - docs/main-concepts/fiber-scheduling.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
@@ -297,6 +298,7 @@ files:
 - 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