polyphony 0.43.4 → 0.43.10

data/lib/polyphony.rb

@@ -4,9 +4,6 @@ require 'fiber'
 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
@@ -20,13 +17,12 @@ require_relative './polyphony/extensions/fiber'
 require_relative './polyphony/extensions/io'
 
 Thread.current.setup_fiber_scheduling
-Thread.current.agent = Polyphony::LibevAgent.new
+Thread.current.agent = Polyphony::Agent.new
 
 require_relative './polyphony/core/global_api'
 require_relative './polyphony/core/resource_pool'
 require_relative './polyphony/net'
 require_relative './polyphony/adapters/process'
-require_relative './polyphony/event'
 
 # Main Polyphony API
 module Polyphony
@@ -102,7 +98,10 @@ module Polyphony
 
     def install_terminating_signal_handlers
       trap('SIGTERM', SystemExit)
-      trap('SIGINT', Interrupt)
+      orig_trap('SIGINT') do
+        orig_trap('SIGINT') { exit! }
+        Thread.current.break_out_of_ev_loop(Thread.main.main_fiber, Interrupt.new)
+      end
     end
 
     def terminate_threads

data/lib/polyphony/core/channel.rb

@@ -5,42 +5,11 @@ require_relative './exceptions'
 module Polyphony
   # Implements a unidirectional communication channel along the lines of Go
   # (buffered) channels.
-  class Channel
-    def initialize
-      @payload_queue = []
-      @waiting_queue = []
-    end
+  class Channel < Polyphony::Queue
+    alias_method :receive, :shift
 
     def close
-      stop = Polyphony::MoveOn.new
-      @waiting_queue.slice(0..-1).each { |f| f.schedule(stop) }
-    end
-
-    def <<(value)
-      if @waiting_queue.empty?
-        @payload_queue << value
-      else
-        @waiting_queue.shift&.schedule(value)
-      end
-      snooze
-    end
-
-    def receive
-      Thread.current.agent.ref
-      if @payload_queue.empty?
-        @waiting_queue << Fiber.current
-        suspend
-      else
-        receive_from_queue
-      end
-    ensure
-      Thread.current.agent.unref
-    end
-
-    def receive_from_queue
-      payload = @payload_queue.shift
-      snooze
-      payload
+      flush_waiters(Polyphony::MoveOn.new)
     end
   end
 end

data/lib/polyphony/core/resource_pool.rb

@@ -10,13 +10,10 @@ module Polyphony
     # @param &block [Proc] allocator block
     def initialize(opts, &block)
       @allocator = block
-
-      @stock = []
-      @queue = []
-      @acquired_resources = {}
-
       @limit = opts[:limit] || 4
       @size = 0
+      @stock = Polyphony::Queue.new
+      @acquired_resources = {}
     end
 
     def available
@@ -25,58 +22,17 @@ module Polyphony
 
     def acquire
       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
-      ready_resource = from_stock
-      return ready_resource if ready_resource
+      return @acquired_resources[fiber] if @acquired_resources[fiber]
 
-      suspend
+      add_to_stock if @size < @limit && @stock.empty?
+      resource = @stock.shift
+      @acquired_resources[fiber] = resource
+      yield resource
     ensure
-      @queue.delete(fiber)
-    end
-
-    def release(resource)
-      if resource.__discarded__
-        @size -= 1
-      elsif resource
-        return_to_stock(resource)
-        dequeue
-      end
-    end
-
-    def dequeue
-      return if @queue.empty? || @stock.empty?
-
-      @queue.shift.schedule(@stock.shift)
+      @acquired_resources.delete(fiber)
+      @stock.push resource if resource
     end
-
-    def return_to_stock(resource)
-      @stock << resource
-    end
-
-    def from_stock
-      @stock.shift || (@size < @limit && allocate)
-    end
-
+        
     def method_missing(sym, *args, &block)
       acquire { |r| r.send(sym, *args, &block) }
     end
@@ -85,33 +41,15 @@ module Polyphony
       true
     end
 
-    # Extension to allow discarding of resources
-    module ResourceExtensions
-      def __discarded__
-        @__discarded__
-      end
-
-      def __discard__
-        @__discarded__ = true
-      end
-    end
-
     # Allocates a resource
     # @return [any] allocated resource
-    def allocate
-      @size += 1
-      @allocator.().tap { |r| r.extend ResourceExtensions }
-    end
-
-    def <<(resource)
+    def add_to_stock
       @size += 1
-      resource.extend ResourceExtensions
-      @stock << resource
-      dequeue
+      @stock << @allocator.call
     end
 
     def preheat!
-      (@limit - @size).times { @stock << allocate }
+      add_to_stock while @size < @limit
     end
   end
 end

data/lib/polyphony/core/sync.rb

@@ -4,18 +4,21 @@ module Polyphony
   # Implements mutex lock for synchronizing access to a shared resource
   class Mutex
     def initialize
-      @waiting_fibers = Polyphony::Queue.new
+      @store = Queue.new
+      @store << :token
     end
 
     def synchronize
-      fiber = Fiber.current
-      @waiting_fibers << fiber
-      suspend if @waiting_fibers.size > 1
-      yield
-    ensure
-      @waiting_fibers.delete(fiber)
-      @waiting_fibers.first&.schedule
-      snooze
+      return yield if @holding_fiber == Fiber.current
+
+      begin
+        token = @store.shift
+        @holding_fiber = Fiber.current
+        yield
+      ensure
+        @holding_fiber = nil
+        @store << token if token
+      end
     end
   end
 end

data/lib/polyphony/core/thread_pool.rb

@@ -49,7 +49,7 @@ module Polyphony
     end
 
     def run_queued_task
-      (block, watcher) = @task_queue.pop
+      (block, watcher) = @task_queue.shift
       result = block.()
       watcher&.signal(result)
     rescue Exception => e

data/lib/polyphony/extensions/core.rb

@@ -107,6 +107,15 @@ module ::Kernel
     $stdin.gets
   end
 
+  alias_method :orig_p, :p
+  def p(*args)
+    strs = args.inject([]) do |m, a|
+      m << a.inspect << "\n"
+    end
+    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|

data/lib/polyphony/extensions/fiber.rb

@@ -189,7 +189,7 @@ module Polyphony
     end
 
     def receive_pending
-      @mailbox.shift_each
+      @mailbox.shift_all
     end
   end
 
@@ -221,7 +221,14 @@ module Polyphony
     def await_all_children
       return unless @children && !@children.empty?
 
-      Fiber.await(*@children.keys)
+      @results = @children.dup
+      @on_child_done = proc do |c, r|
+        @results[c] = r
+        self.schedule if @children.empty?
+      end
+      suspend
+      @on_child_done = nil
+      @results.values
     end
 
     def shutdown_all_children

data/lib/polyphony/extensions/io.rb

@@ -108,19 +108,23 @@ class ::IO
   end
 
   alias_method :orig_readpartial, :read
-  def readpartial(len)
+  def readpartial(len, str = nil)
     @read_buffer ||= +''
     result = Thread.current.agent.read(self, @read_buffer, len, false)
     raise EOFError unless result
 
-    already_read = @read_buffer
+    if str
+      str << @read_buffer
+    else
+      str = @read_buffer
+    end
     @read_buffer = +''
-    already_read
+    str
   end
 
   alias_method :orig_write, :write
-  def write(str)
-    Thread.current.agent.write(self, str)
+  def write(str, *args)
+    Thread.current.agent.write(self, str, *args)
   end
 
   alias_method :orig_write_chevron, :<<
@@ -166,16 +170,13 @@ class ::IO
       return
     end
 
-    s = args.each_with_object(+'') do |a, str|
-      if a.is_a?(Array)
-        a.each { |a2| str << a2.to_s << "\n" }
-      else
-        a = a.to_s
-        str << a
-        str << "\n" unless a =~ /\n$/
-      end
+    strs = args.inject([]) do |m, a|
+      a = a.to_s
+      m << a
+      m << "\n" unless a =~ /\n$/
+      m
     end
-    write s
+    write *strs
     nil
   end
 
@@ -193,7 +194,7 @@ class ::IO
 
   alias_method :orig_write_nonblock, :write_nonblock
   def write_nonblock(string, _options = {})
-    write(string, 0)
+    write(string)
   end
 
   alias_method :orig_read_nonblock, :read_nonblock

data/lib/polyphony/extensions/openssl.rb

@@ -5,6 +5,12 @@ require_relative './socket'
 
 # Open ssl socket helper methods (to make it compatible with Socket API)
 class ::OpenSSL::SSL::SSLSocket
+  alias_method :orig_initialize, :initialize
+  def initialize(socket, context = nil)
+    socket = socket.respond_to?(:io) ? socket.io || socket : socket
+    context ? orig_initialize(socket, context) : orig_initialize(socket)
+  end
+
   def dont_linger
     io.dont_linger
   end
@@ -35,6 +41,7 @@ class ::OpenSSL::SSL::SSLSocket
     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)
       else return result
       end
     end
@@ -44,6 +51,7 @@ 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)
       else
         return result

data/lib/polyphony/extensions/socket.rb

@@ -5,6 +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
@@ -14,15 +24,7 @@ class ::Socket
   NO_EXCEPTION = { exception: false }.freeze
 
   def connect(remotesockaddr)
-    loop do
-      result = connect_nonblock(remotesockaddr, **NO_EXCEPTION)
-      case result
-      when 0 then return
-      when :wait_writable then Thread.current.agent.wait_io(self, true)
-      else
-        raise IOError
-      end
-    end
+    Thread.current.agent.connect(self, remotesockaddr.ip_address, remotesockaddr.ip_port)
   end
 
   def recv(maxlen, flags = 0, outbuf = nil)
@@ -77,6 +79,8 @@ end
 class ::TCPSocket
   NO_EXCEPTION = { exception: false }.freeze
 
+  attr_reader :io
+
   def initialize(remote_host, remote_port, local_host = nil, local_port = nil)
     @io = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
     if local_host && local_port

data/lib/polyphony/extensions/thread.rb

@@ -18,7 +18,7 @@ class ::Thread
   def execute
     # agent must be created in the context of the new thread, therefore it
     # cannot be created in Thread#initialize
-    @agent = Polyphony::LibevAgent.new
+    @agent = Polyphony::Agent.new
     setup
     @ready = true
     result = @block.(*@args)

data/lib/polyphony/version.rb

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

data/test/helper.rb

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

data/test/q.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'fiber'
+require_relative '../lib/polyphony_ext'
+
+queue = Polyphony::LibevQueue.new
+
+queue.push :a
+queue.push :b
+queue.push :c
+p [queue.shift_no_wait]
+queue.push :d
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+
+queue.unshift :e
+p [queue.shift_no_wait]
+
+queue.push :f
+queue.push :g
+p [queue.shift_no_wait]