polyphony 0.44.0 → 0.45.0

data/lib/polyphony/core/sync.rb

@@ -12,12 +12,48 @@ module Polyphony
       return yield if @holding_fiber == Fiber.current
 
       begin
-        token = @store.shift
+        @token = @store.shift
         @holding_fiber = Fiber.current
         yield
       ensure
         @holding_fiber = nil
-        @store << token if token
+        @store << @token if @token
+      end
+    end
+
+    def conditional_release
+      @store << @token
+      @token = nil
+      @holding_fiber = nil
+    end
+
+    def conditional_reacquire
+      @token = @store.shift
+      @holding_fiber = Fiber.current
+    end
+  end
+
+  # Implements a fiber-aware ConditionVariable
+  class ConditionVariable
+    def initialize
+      @queue = Polyphony::Queue.new
+    end
+
+    def wait(mutex, _timeout = nil)
+      mutex.conditional_release
+      @queue << Fiber.current
+      Thread.current.backend.wait_event(true)
+      mutex.conditional_reacquire
+    end
+
+    def signal
+      fiber = @queue.shift
+      fiber.schedule
+    end
+
+    def broadcast
+      while (fiber = @queue.shift)
+        fiber.schedule
       end
     end
   end

data/lib/polyphony/core/throttler.rb

@@ -12,7 +12,7 @@ module Polyphony
     def call
       now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
       delta = @next_time - now
-      Thread.current.agent.sleep(delta) if delta > 0
+      Thread.current.backend.sleep(delta) if delta > 0
       yield self
 
       loop do

data/lib/polyphony/extensions/core.rb

@@ -57,7 +57,7 @@ module ::Process
   class << self
     alias_method :orig_detach, :detach
     def detach(pid)
-      fiber = spin { Thread.current.agent.waitpid(pid) }
+      fiber = spin { Thread.current.backend.waitpid(pid) }
       fiber.define_singleton_method(:pid) { pid }
       fiber
     end
@@ -116,19 +116,28 @@ module ::Kernel
     strs = args.inject([]) do |m, a|
       m << a.inspect << "\n"
     end
-    STDOUT.write *strs
+    STDOUT.write(*strs)
     args.size == 1 ? args.first : args
   end
 
   alias_method :orig_system, :system
   def system(*args)
-    Open3.popen2(*args) do |i, o, _t|
-      i.close
-      pipe_to_eof(o, $stdout)
+    Kernel.system(*args)
+  end
+
+  class << self
+    alias_method :orig_system, :system
+    def system(*args)
+      waiter = nil
+      Open3.popen2(*args) do |i, o, t|
+        waiter = t
+        i.close
+        pipe_to_eof(o, $stdout)
+      end
+      waiter.await.last == 0
+    rescue SystemCallError
+      nil
     end
-    true
-  rescue SystemCallError
-    nil
   end
 
   def pipe_to_eof(src, dest)
@@ -143,23 +152,15 @@ module ::Kernel
   alias_method :orig_trap, :trap
   def trap(sig, command = nil, &block)
     return orig_trap(sig, command) if command.is_a? String
-      
-    block = command if !block && command.respond_to?(:call)
-    if block
-      exception = Polyphony::Interjection.new(block)
-    else
-      exception = command.is_a?(Class) && command.new
-    end
 
-    unless exception
-      raise ArgumentError, "Must supply block or exception or callable object"
-    end
+    block = command if !block && command.respond_to?(:call)
+    exception = signal_exception(block, command)
 
     # The signal trap can be invoked at any time, including while the system
-    # agent is blocking while polling for events. In order to deal with this
+    # backend is blocking while polling for events. In order to deal with this
     # correctly, we spin a fiber that will run the signal handler code, then
     # call break_out_of_ev_loop, which will put the fiber at the front of the
-    # run queue, then wake up the system agent.
+    # run queue, then wake up the backend.
     #
     # If the command argument is an exception class however, it will be raised
     # directly in the context of the main fiber.
@@ -169,6 +170,16 @@ module ::Kernel
   end
 end
 
+def signal_exception(block, command)
+  if block
+    Polyphony::Interjection.new(block)
+  elsif command.is_a?(Class)
+    command.new
+  else
+    raise ArgumentError, 'Must supply block or exception or callable object'
+  end
+end
+
 # Override Timeout to use cancel scope
 module ::Timeout
   def self.timeout(sec, klass = nil, message = nil, &block)

data/lib/polyphony/extensions/fiber.rb

@@ -228,7 +228,7 @@ module Polyphony
       @results = @children.dup
       @on_child_done = proc do |c, r|
         @results[c] = r
-        self.schedule if @children.empty?
+        schedule if @children.empty?
       end
       suspend
       @on_child_done = nil

data/lib/polyphony/extensions/io.rb

@@ -99,7 +99,7 @@ class ::IO
   alias_method :orig_read, :read
   def read(len = nil)
     @read_buffer ||= +''
-    result = Thread.current.agent.read(self, @read_buffer, len, true)
+    result = Thread.current.backend.read(self, @read_buffer, len, true)
     return nil unless result
 
     already_read = @read_buffer
@@ -110,7 +110,7 @@ class ::IO
   alias_method :orig_readpartial, :read
   def readpartial(len, str = nil)
     @read_buffer ||= +''
-    result = Thread.current.agent.read(self, @read_buffer, len, false)
+    result = Thread.current.backend.read(self, @read_buffer, len, false)
     raise EOFError unless result
 
     if str
@@ -124,12 +124,12 @@ class ::IO
 
   alias_method :orig_write, :write
   def write(str, *args)
-    Thread.current.agent.write(self, str, *args)
+    Thread.current.backend.write(self, str, *args)
   end
 
   alias_method :orig_write_chevron, :<<
   def <<(str)
-    Thread.current.agent.write(self, str)
+    Thread.current.backend.write(self, str)
     self
   end
 
@@ -170,13 +170,12 @@ class ::IO
       return
     end
 
-    strs = args.inject([]) do |m, a|
+    strs = args.each_with_object([]) do |a, m|
       a = a.to_s
       m << a
       m << "\n" unless a =~ /\n$/
-      m
     end
-    write *strs
+    write(*strs)
     nil
   end
 
@@ -203,7 +202,7 @@ class ::IO
   end
 
   def read_loop(&block)
-    Thread.current.agent.read_loop(self, &block)
+    Thread.current.backend.read_loop(self, &block)
   end
 
   # alias_method :orig_read, :read

data/lib/polyphony/extensions/openssl.rb

@@ -28,8 +28,8 @@ class ::OpenSSL::SSL::SSLSocket
     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)
+      when :wait_readable then Thread.current.backend.wait_io(io, false)
+      when :wait_writable then Thread.current.backend.wait_io(io, true)
       else
         return result
       end
@@ -40,8 +40,8 @@ class ::OpenSSL::SSL::SSLSocket
   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)
-      when :wait_writable then Thread.current.agent.wait_io(io, true)
+      when :wait_readable then Thread.current.backend.wait_io(io, false)
+      when :wait_writable then Thread.current.backend.wait_io(io, true)
       else return result
       end
     end
@@ -51,8 +51,8 @@ class ::OpenSSL::SSL::SSLSocket
   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)
+      when :wait_readable then Thread.current.backend.wait_io(io, false)
+      when :wait_writable then Thread.current.backend.wait_io(io, true)
       else
         return result
       end

data/lib/polyphony/extensions/socket.rb

@@ -5,26 +5,16 @@ require 'socket'
 require_relative './io'
 require_relative '../core/thread_pool'
 
-class ::BasicSocket
-  def write_nonblock(string, _options = {})
-    write(string)
-  end
-
-  def read_nonblock(maxlen, str = nil, _options = {})
-    readpartial(maxlen, str)
-  end
-end
-
 # Socket overrides (eventually rewritten in C)
 class ::Socket
   def accept
-    Thread.current.agent.accept(self)
+    Thread.current.backend.accept(self)
   end
 
   NO_EXCEPTION = { exception: false }.freeze
 
   def connect(remotesockaddr)
-    Thread.current.agent.connect(self, remotesockaddr.ip_address, remotesockaddr.ip_port)
+    Thread.current.backend.connect(self, remotesockaddr.ip_address, remotesockaddr.ip_port)
   end
 
   def recv(maxlen, flags = 0, outbuf = nil)
@@ -33,7 +23,7 @@ class ::Socket
       result = recv_nonblock(maxlen, flags, outbuf, **NO_EXCEPTION)
       case result
       when nil then raise IOError
-      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      when :wait_readable then Thread.current.backend.wait_io(self, false)
       else
         return result
       end
@@ -46,7 +36,7 @@ class ::Socket
       result = recvfrom_nonblock(maxlen, flags, @read_buffer, **NO_EXCEPTION)
       case result
       when nil then raise IOError
-      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      when :wait_readable then Thread.current.backend.wait_io(self, false)
       else
         return result
       end

data/lib/polyphony/extensions/thread.rb

@@ -16,21 +16,22 @@ class ::Thread
   end
 
   def execute
-    # agent must be created in the context of the new thread, therefore it
+    # backend must be created in the context of the new thread, therefore it
     # cannot be created in Thread#initialize
-    @agent = Polyphony::Agent.new
+    @backend = Polyphony::Backend.new
     setup
     @ready = true
     result = @block.(*@args)
   rescue Polyphony::MoveOn, Polyphony::Terminate => e
     result = e.value
-  rescue Exception => result
+  rescue Exception => e
+    result = e
   ensure
     @ready = true
     finalize(result)
   end
 
-  attr_accessor :agent
+  attr_accessor :backend
 
   def setup
     @main_fiber = Fiber.current
@@ -48,7 +49,7 @@ class ::Thread
       @result = result
       signal_waiters(result)
     end
-    @agent.finalize
+    @backend.finalize
   end
 
   def signal_waiters(result)

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -21,17 +21,18 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
-  s.add_development_dependency  'httparty',             '0.17.0'
-  s.add_development_dependency  'localhost',            '1.1.4'
+  s.add_development_dependency  'rake-compiler',        '1.0.5'
   s.add_development_dependency  'minitest',             '5.13.0'
   s.add_development_dependency  'minitest-reporters',   '1.4.2'
   s.add_development_dependency  'simplecov',            '0.17.1'
   s.add_development_dependency  'rubocop',              '0.85.1'
+  s.add_development_dependency  'pry',                  '0.13.1'
+  
   s.add_development_dependency  'pg',                   '1.1.4'
-  s.add_development_dependency  'rake-compiler',        '1.0.5'
   s.add_development_dependency  'redis',                '4.1.0'
   s.add_development_dependency  'hiredis',              '0.6.3'
   s.add_development_dependency  'http_parser.rb',       '~>0.6.0'
+  s.add_development_dependency  'rack',               '>=2.0.8', '<2.3.0'
   s.add_development_dependency  'mysql2',               '0.5.3'
   s.add_development_dependency  'sequel',               '5.34.0'
 

data/test/helper.rb

@@ -31,7 +31,7 @@ class MiniTest::Test
     end
     Fiber.current.setup_main_fiber
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
-    Thread.current.agent = Polyphony::Agent.new
+    Thread.current.backend = Polyphony::Backend.new
     sleep 0 # apparently this helps with timer accuracy
   end
 

data/test/{test_agent.rb → test_backend.rb}

@@ -2,39 +2,39 @@
 
 require_relative 'helper'
 
-class AgentTest < MiniTest::Test
+class BackendTest < MiniTest::Test
   def setup
     super
-    @prev_agent = Thread.current.agent
-    @agent = Polyphony::Agent.new
-    Thread.current.agent = @agent
+    @prev_backend = Thread.current.backend
+    @backend = Polyphony::Backend.new
+    Thread.current.backend = @backend
   end
 
   def teardown
-    @agent.finalize
-    Thread.current.agent = @prev_agent
+    @backend.finalize
+    Thread.current.backend = @prev_backend
   end
 
   def test_sleep
     count = 0
     t0 = Time.now
     spin {
-      @agent.sleep 0.01
+      @backend.sleep 0.01
       count += 1
-      @agent.sleep 0.01
+      @backend.sleep 0.01
       count += 1
-      @agent.sleep 0.01
+      @backend.sleep 0.01
       count += 1
     }.await
-    assert Time.now - t0 >= 0.03
+    assert_in_delta 0.03, Time.now - t0, 0.005
     assert_equal 3, count
   end
 
   def test_write_read_partial
     i, o = IO.pipe
     buf = +''
-    f = spin { @agent.read(i, buf, 5, false) }
-    @agent.write(o, 'Hello world')
+    f = spin { @backend.read(i, buf, 5, false) }
+    @backend.write(o, 'Hello world')
     return_value = f.await
     
     assert_equal 'Hello', buf
@@ -44,10 +44,10 @@ class AgentTest < MiniTest::Test
   def test_write_read_to_eof_limited_buffer
     i, o = IO.pipe
     buf = +''
-    f = spin { @agent.read(i, buf, 5, true) }
-    @agent.write(o, 'Hello')
+    f = spin { @backend.read(i, buf, 5, true) }
+    @backend.write(o, 'Hello')
     snooze
-    @agent.write(o, ' world')
+    @backend.write(o, ' world')
     snooze
     o.close
     return_value = f.await
@@ -59,10 +59,10 @@ class AgentTest < MiniTest::Test
   def test_write_read_to_eof
     i, o = IO.pipe
     buf = +''
-    f = spin { @agent.read(i, buf, 10**6, true) }
-    @agent.write(o, 'Hello')
+    f = spin { @backend.read(i, buf, 10**6, true) }
+    @backend.write(o, 'Hello')
     snooze
-    @agent.write(o, ' world')
+    @backend.write(o, ' world')
     snooze
     o.close
     return_value = f.await
@@ -73,11 +73,11 @@ class AgentTest < MiniTest::Test
 
   def test_waitpid
     pid = fork do
-      @agent.post_fork
+      @backend.post_fork
       exit(42)
     end
     
-    result = @agent.waitpid(pid)
+    result = @backend.waitpid(pid)
     assert_equal [pid, 42], result
   end
 
@@ -87,7 +87,7 @@ class AgentTest < MiniTest::Test
     buf = []
     spin do
       buf << :ready
-      @agent.read_loop(i) { |d| buf << d }
+      @backend.read_loop(i) { |d| buf << d }
       buf << :done
     end
 
@@ -107,7 +107,7 @@ class AgentTest < MiniTest::Test
 
     clients = []
     server_fiber = spin do
-      @agent.accept_loop(server) { |c| clients << c }
+      @backend.accept_loop(server) { |c| clients << c }
     end
 
     c1 = TCPSocket.new('127.0.0.1', 1234)