polyphony 0.43.8 → 0.45.0

data/test/test_event.rb

@@ -34,6 +34,7 @@ class EventTest < MiniTest::Test
       }
     }
     snooze
+
     t = Thread.new do
       orig_sleep 0.001
       3.times { a.signal }

data/test/test_fiber.rb

@@ -352,7 +352,7 @@ class FiberTest < MiniTest::Test
     result = []
     f = Fiber.current.spin do
       result << :start
-      result << Thread.current.agent.sleep(1)
+      result << Thread.current.backend.sleep(1)
     end
     snooze
     f.interrupt
@@ -413,6 +413,22 @@ class FiberTest < MiniTest::Test
     f2&.stop
   end
 
+  def test_interject
+    buf = []
+    f = spin_loop { sleep }
+    snooze
+    f.interject { buf << Fiber.current }
+    snooze
+    assert_equal [f], buf
+    assert_equal :waiting, f.state
+
+    f.interject { buf << :foo; raise Polyphony::MoveOn }
+    snooze
+
+    assert_equal [f, :foo], buf
+    assert_equal :dead, f.state
+  end
+
   def test_state
     counter = 0
     f = spin do
@@ -625,7 +641,7 @@ class FiberTest < MiniTest::Test
       end
     end
     sleep 0.1
-    f = spin { Thread.current.agent.waitpid(pid) }
+    f = spin { Thread.current.backend.waitpid(pid) }
     o.close
     Process.kill('INT', pid)
     f.await
@@ -647,7 +663,7 @@ class FiberTest < MiniTest::Test
       end
     end
     sleep 0.2
-    f = spin { Thread.current.agent.waitpid(pid) }
+    f = spin { Thread.current.backend.waitpid(pid) }
     o.close
     Process.kill('TERM', pid)
     f.await
@@ -674,7 +690,7 @@ class FiberTest < MiniTest::Test
       sleep 0.2
       Process.kill('TERM', pid)
     end
-    Thread.current.agent.waitpid(pid)
+    Thread.current.backend.waitpid(pid)
     klass = i.read
     i.close
     assert_equal 'Polyphony::Terminate', klass
@@ -692,7 +708,7 @@ class FiberTest < MiniTest::Test
 
     f.schedule
     f << 'bar'
-    snooze
+    2.times { snooze }
     assert_equal ['bar'], buffer
   end
 end

data/test/test_io.rb

@@ -55,7 +55,7 @@ class IOTest < MiniTest::Test
         results << result
         case result
         when :wait_readable
-          Thread.current.agent.wait_io(i, false)
+          Thread.current.backend.wait_io(i, false)
         else
           break result
         end

data/test/test_kernel.rb

@@ -19,6 +19,11 @@ class KernelTest < MiniTest::Test
     timer&.stop
   end
 
+  def test_Kernel_system_singleton_method
+    assert_equal true, Kernel.system("which ruby > /dev/null 2>&1")
+    assert_equal false, Kernel.system("which rruubbyy > /dev/null 2>&1")
+  end
+
   def patch_open3
     class << Open3
       alias_method :orig_popen2, :popen2

data/test/test_queue.rb

@@ -109,4 +109,24 @@ class QueueTest < MiniTest::Test
     @queue << :foo
     assert_nil f1.await
   end
+
+  def test_queue_size
+    assert_equal 0, @queue.size
+
+    @queue.push 1
+    
+    assert_equal 1, @queue.size
+
+    @queue.push 2
+    
+    assert_equal 2, @queue.size
+
+    @queue.shift
+
+    assert_equal 1, @queue.size
+
+    @queue.shift
+
+    assert_equal 0, @queue.size
+  end
 end

data/test/test_resource_pool.rb

@@ -12,29 +12,19 @@ class ResourcePoolTest < MiniTest::Test
     assert_equal 0, pool.size
 
     results = []
-    4.times {
-      spin {
-        snooze
+    4.times { |i|
+      spin(:"foo#{i}") {
         pool.acquire { |resource|
           results << resource
           snooze
         }
       }
     }
-    2.times { snooze }
-    assert_equal 2, pool.limit
-    assert_equal 0, pool.available
-    assert_equal 2, pool.size
-
-    2.times { snooze }
-
-    assert_equal ['a', 'b', 'a', 'b'], results
-
-    2.times { snooze }
-
+    Fiber.current.await_all_children
     assert_equal 2, pool.limit
     assert_equal 2, pool.available
     assert_equal 2, pool.size
+    assert_equal ['a', 'b', 'a', 'b'], results
   end
 
   def test_discard
@@ -46,40 +36,18 @@ class ResourcePoolTest < MiniTest::Test
       spin {
         snooze
         pool.acquire { |resource|
-          results << resource
-          resource.__discard__ if resource == 'b'
+        results << resource
+        pool.discard! if resource == 'b'
           snooze
         }
       }
     }
-    6.times { snooze }
+    Fiber.current.await_all_children
 
     assert_equal ['a', 'b', 'a', 'a'], results
     assert_equal 1, pool.size
   end
 
-  def test_add
-    resources = [+'a', +'b']
-    pool = Polyphony::ResourcePool.new(limit: 2) { resources.shift }
-
-    pool << +'c'
-
-    results = []
-    4.times {
-      spin {
-        snooze
-        pool.acquire { |resource|
-          results << resource
-          resource.__discard__ if resource == 'b'
-          snooze
-        }
-      }
-    }
-    6.times { snooze }
-
-    assert_equal ['c', 'a', 'c', 'a'], results
-  end
-
   def test_single_resource_limit
     resources = [+'a', +'b']
     pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
@@ -94,7 +62,7 @@ class ResourcePoolTest < MiniTest::Test
         }
       }
     }
-    20.times { snooze }
+    Fiber.current.await_all_children
 
     assert_equal ['a'] * 10, results
   end
@@ -128,11 +96,34 @@ class ResourcePoolTest < MiniTest::Test
     resources = [+'a', +'b']
     pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
 
+    results = []
     pool.acquire do |r|
-      assert_equal 'a', r
-      pool.acquire do |r|
-        assert_equal 'a', r
+      results << r
+      2.times do
+        pool.acquire do |r|
+          results << r
+        end
       end
     end
+    assert_equal ['a']*3, results
+  end
+
+  def test_overloaded_resource_pool
+    pool = Polyphony::ResourcePool.new(limit: 1) { 1 }
+
+    buf = []
+    fibers = 2.times.map do |i|
+      spin(:"foo#{i}") do
+        2.times do
+          pool.acquire do |r|
+            buf << r
+            snooze
+          end
+        end
+      end
+    end
+    Fiber.current.await_all_children
+
+    assert_equal [1, 1, 1, 1], buf
   end
 end

data/test/test_signal.rb

@@ -23,7 +23,7 @@ class SignalTrapTest < Minitest::Test
     sleep 0.01
     o.close
     Process.kill('INT', pid)
-    Thread.current.agent.waitpid(pid)
+    Thread.current.backend.waitpid(pid)
     buffer = i.read
     assert_equal "3-interrupt\n", buffer
   end
@@ -51,40 +51,16 @@ class SignalTrapTest < Minitest::Test
     sleep 0.02
     o.close
     Process.kill('INT', pid)
-    Thread.current.agent.waitpid(pid)
+    Thread.current.backend.waitpid(pid)
     buffer = i.read
     assert_equal "3 - interrupted\n2 - terminated\n1 - terminated\n", buffer
   end
 
-  def test_signal_exception_possible_race_condition
+  def test_interrupt_signal_scheduling
     i, o = IO.pipe
     pid = Polyphony.fork do
       i.close
-      f1 = nil
-      f2 = spin do
-        # this fiber will try to create a race condition by
-        # - being scheduled before f1 is scheduled with the Interrupt exception
-        # - scheduling f1 without an exception
-        suspend
-        f1.schedule
-      rescue ::Interrupt => e
-        o.puts '2-interrupt'
-        raise e
-      end
-      f1 = spin do
-        # this fiber is the one that will be current when the
-        # signal is trapped
-        sleep 1
-        o << 'boom'
-      rescue ::Interrupt => e
-        o.puts '1-interrupt'
-        raise e
-      end
-      old_trap = trap('INT') do
-        f2.schedule
-        old_trap.()
-      end
-      Fiber.current.await_all_children
+      sleep
     rescue ::Interrupt => e
       o.puts '3-interrupt'
     ensure
@@ -93,7 +69,7 @@ class SignalTrapTest < Minitest::Test
     o.close
     sleep 0.1
     Process.kill('INT', pid)
-    Thread.current.agent.waitpid(pid)
+    Thread.current.backend.waitpid(pid)
     buffer = i.read
     assert_equal "3-interrupt\n", buffer
   end

data/test/test_sync.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class MutexTest < MiniTest::Test
+  def test_mutex
+    buf = []
+    lock = Polyphony::Mutex.new
+    (1..3).each do |i|
+      spin do
+        lock.synchronize do
+          buf << ">> #{i}"
+          sleep(rand * 0.05)
+          buf << "<< #{i}"
+        end
+      end
+    end
+
+    Fiber.current.await_all_children
+    assert_equal ['>> 1', '<< 1', '>> 2', '<< 2', '>> 3', '<< 3'], buf
+  end
+
+  def test_condition_variable
+    buf = []
+    lock1 = Polyphony::Mutex.new
+    lock2 = Polyphony::Mutex.new
+    cond = Polyphony::ConditionVariable.new
+
+    spin do
+      lock1.synchronize do
+        sleep 0.01
+        cond.wait(lock1)
+        lock2.synchronize do
+          buf << :foo
+        end
+      end
+    end
+
+    spin do
+      lock2.synchronize do
+        sleep 0.01
+        lock1.synchronize do
+          buf << :bar
+        end
+        cond.signal
+      end
+    end
+
+    Fiber.current.await_all_children
+    assert_equal [:bar, :foo], buf
+  end
+end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.43.8
+  version: 0.45.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-- !ruby/object:Gem::Dependency
-  name: localhost
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.85.1
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +150,54 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.34.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.34.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +262,6 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- ".gitbook.yaml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -241,9 +274,11 @@ files:
 - Rakefile
 - TODO.md
 - bin/polyphony-debug
+- bin/stress.rb
 - docs/_config.yml
 - docs/_includes/head.html
 - docs/_includes/title.html
+- docs/_posts/2020-07-26-polyphony-0.44.md
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
 - docs/_user-guide/all-about-timers.md
@@ -292,12 +327,14 @@ files:
 - examples/adapters/redis_client.rb
 - examples/adapters/redis_pubsub.rb
 - examples/adapters/redis_pubsub_perf.rb
+- examples/adapters/sequel_mysql.rb
+- examples/adapters/sequel_mysql_pool.rb
 - examples/core/01-spinning-up-fibers.rb
 - examples/core/02-awaiting-fibers.rb
 - examples/core/03-interrupting.rb
 - examples/core/04-handling-signals.rb
-- examples/core/xx-agent.rb
 - examples/core/xx-at_exit.rb
+- examples/core/xx-backend.rb
 - examples/core/xx-caller.rb
 - examples/core/xx-channels.rb
 - examples/core/xx-daemon.rb
@@ -349,6 +386,8 @@ files:
 - examples/io/xx-irb.rb
 - examples/io/xx-net-http.rb
 - examples/io/xx-open.rb
+- examples/io/xx-pry.rb
+- examples/io/xx-rack_server.rb
 - examples/io/xx-switch.rb
 - examples/io/xx-system.rb
 - examples/io/xx-tcpserver.rb
@@ -388,11 +427,13 @@ files:
 - ext/libev/ev_win32.c
 - ext/libev/ev_wrap.h
 - ext/libev/test_libev_win32.c
+- ext/polyphony/backend.h
+- ext/polyphony/event.c
 - ext/polyphony/extconf.rb
 - ext/polyphony/fiber.c
 - ext/polyphony/libev.c
 - ext/polyphony/libev.h
-- ext/polyphony/libev_agent.c
+- ext/polyphony/libev_backend.c
 - ext/polyphony/polyphony.c
 - ext/polyphony/polyphony.h
 - ext/polyphony/polyphony_ext.c
@@ -404,9 +445,12 @@ files:
 - lib/polyphony.rb
 - lib/polyphony/adapters/fs.rb
 - lib/polyphony/adapters/irb.rb
+- lib/polyphony/adapters/mysql2.rb
 - lib/polyphony/adapters/postgres.rb
 - lib/polyphony/adapters/process.rb
+- lib/polyphony/adapters/readline.rb
 - lib/polyphony/adapters/redis.rb
+- lib/polyphony/adapters/sequel.rb
 - lib/polyphony/adapters/trace.rb
 - lib/polyphony/core/channel.rb
 - lib/polyphony/core/exceptions.rb
@@ -415,7 +459,6 @@ files:
 - lib/polyphony/core/sync.rb
 - lib/polyphony/core/thread_pool.rb
 - lib/polyphony/core/throttler.rb
-- lib/polyphony/event.rb
 - lib/polyphony/extensions/core.rb
 - lib/polyphony/extensions/fiber.rb
 - lib/polyphony/extensions/io.rb
@@ -431,7 +474,7 @@ files:
 - test/q.rb
 - test/run.rb
 - test/stress.rb
-- test/test_agent.rb
+- test/test_backend.rb
 - test/test_event.rb
 - test/test_ext.rb
 - test/test_fiber.rb
@@ -444,6 +487,7 @@ files:
 - test/test_signal.rb
 - test/test_socket.rb
 - test/test_supervise.rb
+- test/test_sync.rb
 - test/test_thread.rb
 - test/test_thread_pool.rb
 - test/test_throttler.rb