polyphony 0.40 → 0.43.2

data/ext/{gyro → polyphony}/tracing.c

@@ -1,4 +1,4 @@
-#include "gyro.h"
+#include "polyphony.h"
 
 int __tracing_enabled__ = 0;
 

data/lib/polyphony.rb

@@ -1,43 +1,50 @@
 # frozen_string_literal: true
 
 require 'fiber'
-require_relative './gyro_ext'
+require_relative './polyphony_ext'
 
-Thread.event_selector = Gyro::Selector
-Thread.current.setup_fiber_scheduling
+module Polyphony
+  # Map Queue to Libev queue implementation
+  Queue = LibevQueue
+end
 
 require_relative './polyphony/extensions/core'
 require_relative './polyphony/extensions/thread'
 require_relative './polyphony/extensions/fiber'
 require_relative './polyphony/extensions/io'
 
+Thread.current.setup_fiber_scheduling
+Thread.current.agent = Polyphony::LibevAgent.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
   class << self
     def wait_for_signal(sig)
+      raise "should be reimplemented"
+
       fiber = Fiber.current
-      Gyro.ref
+      # Polyphony.ref
       old_trap = trap(sig) do
-        Gyro.unref
+        # Polyphony.unref
         fiber.schedule(sig)
         trap(sig, old_trap)
       end
       suspend
+
     end
 
     def fork(&block)
       Kernel.fork do
-        Gyro.incr_generation
-
-        # Since the fiber doing the fork will become the main fiber of the
-        # forked process, we leave it behind by transferring to a new fiber
-        # created in the context of the forked process, which rescues *all*
-        # exceptions, including Interrupt and SystemExit.
+        # # Since the fiber doing the fork will become the main fiber of the
+        # # forked process, we leave it behind by transferring to a new fiber
+        # # created in the context of the forked process, which rescues *all*
+        # # exceptions, including Interrupt and SystemExit.
         spin_forked_block(&block).transfer
       end
     end
@@ -63,9 +70,9 @@ module Polyphony
       trap('SIGTERM', 'DEFAULT')
       trap('SIGINT', 'DEFAULT')
 
-      Thread.current.post_fork
       Thread.current.setup
       Fiber.current.setup_main_fiber
+      Thread.current.agent.post_fork
 
       install_terminating_signal_handlers
 

data/lib/polyphony/adapters/irb.rb

@@ -16,7 +16,7 @@ if Object.constants.include?(:Reline)
         fiber.cancel
       end
       read_ios.each do |io|
-        io.read_watcher.await
+        Thread.current.agent.wait_io(io, false)
         return [io]
       end
     rescue Polyphony::Cancel

data/lib/polyphony/adapters/postgres.rb

@@ -10,12 +10,13 @@ module ::PG
   end
 
   def self.connect_async(conn)
+    socket_io = conn.socket_io
     loop do
       res = conn.connect_poll
       case res
       when PGRES_POLLING_FAILED   then raise Error, conn.error_message
-      when PGRES_POLLING_READING  then conn.socket_io.read_watcher.await
-      when PGRES_POLLING_WRITING  then conn.socket_io.write_watcher.await
+      when PGRES_POLLING_READING  then Thread.current.agent.wait_io(socket_io, false)
+      when PGRES_POLLING_WRITING  then Thread.current.agent.wait_io(socket_io, true)
       when PGRES_POLLING_OK       then return conn.setnonblocking(true)
       end
     end
@@ -41,7 +42,7 @@ class ::PG::Connection
 
   def get_result(&block)
     while is_busy
-      socket_io.read_watcher.await
+      Thread.current.agent.wait_io(socket_io, false)
       consume_input
     end
     orig_get_result(&block)
@@ -58,7 +59,7 @@ class ::PG::Connection
 
   def block(_timeout = 0)
     while is_busy
-      socket_io.read_watcher.await
+      Thread.current.agent.wait_io(socket_io, false)
       consume_input
     end
   end
@@ -96,7 +97,7 @@ class ::PG::Connection
     return move_on_after(timeout) { wait_for_notify(&block) } if timeout
 
     loop do
-      socket_io.read_watcher.await
+      Thread.current.agent.wait_io(socket_io, false)
       consume_input
       notice = notifies
       next unless notice

data/lib/polyphony/adapters/process.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module Polyphony
+  # Process patches
   module Process
     class << self
       def watch(cmd = nil, &block)
         terminated = nil
         pid = cmd ? Kernel.spawn(cmd) : Polyphony.fork(&block)
-        watcher = Gyro::Child.new(pid)
-        watcher.await
+        Thread.current.agent.waitpid(pid)
         terminated = true
       ensure
         kill_process(pid) unless terminated || pid.nil?
       end
-      
+
       def kill_process(pid)
         cancel_after(5) do
           kill_and_await('TERM', pid)
@@ -20,10 +20,10 @@ module Polyphony
       rescue Polyphony::Cancel
         kill_and_await(-9, pid)
       end
-      
+
       def kill_and_await(sig, pid)
         ::Process.kill(sig, pid)
-        Gyro::Child.new(pid).await
+        Thread.current.agent.waitpid(pid)
       rescue SystemCallError
         # ignore
         puts 'SystemCallError in kill_and_await'

data/lib/polyphony/adapters/redis.rb

@@ -6,7 +6,7 @@ require 'redis'
 require 'hiredis/reader'
 
 # Polyphony-based Redis driver
-class Driver
+class Polyphony::RedisDriver
   def self.connect(config)
     raise 'unix sockets not supported' if config[:scheme] == 'unix'
 
@@ -43,6 +43,7 @@ class Driver
   end
 
   def format_command(args)
+    args = args.flatten
     (+"*#{args.size}\r\n").tap do |s|
       args.each do |a|
         a = a.to_s
@@ -63,4 +64,4 @@ class Driver
   end
 end
 
-Redis::Connection.drivers << Driver
+Redis::Connection.drivers << Polyphony::RedisDriver

data/lib/polyphony/adapters/trace.rb

@@ -5,6 +5,7 @@ require_relative '../../polyphony'
 STOCK_EVENTS = %i[line call return c_call c_return b_call b_return].freeze
 
 module Polyphony
+  # Tracing functionality for Polyphony
   module Trace
     class << self
       def new(*events)
@@ -12,10 +13,10 @@ module Polyphony
         events = STOCK_EVENTS if events.empty?
         ::TracePoint.new(*events) { |tp| yield trace_record(tp, start_stamp) }
       end
-      
+
       def trace_record(trp, start_stamp)
         stamp = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start_stamp
-      
+
         { stamp: stamp, event: trp.event, location: "#{trp.path}:#{trp.lineno}",
           self: trp.self, binding: trp.binding, fiber: tp_fiber(trp),
           lineno: trp.lineno, method_id: trp.method_id,
@@ -23,103 +24,103 @@ module Polyphony
           return_value: tp_return_value(trp), schedule_value: tp_schedule_value(trp),
           exception: tp_raised_exception(trp) }
       end
-      
+
       def tp_fiber(trp)
         trp.is_a?(FiberTracePoint) ? trp.fiber : Fiber.current
       end
-      
+
       PARAMS_EVENTS = %i[call c_call b_call].freeze
-      
+
       def tp_params(trp)
         PARAMS_EVENTS.include?(trp.event) ? trp.parameters : nil
       end
-      
+
       RETURN_VALUE_EVENTS = %i[return c_return b_return].freeze
-      
+
       def tp_return_value(trp)
         RETURN_VALUE_EVENTS.include?(trp.event) ? trp.return_value : nil
       end
-      
+
       SCHEDULE_VALUE_EVENTS = %i[fiber_schedule fiber_run].freeze
-      
+
       def tp_schedule_value(trp)
         SCHEDULE_VALUE_EVENTS.include?(trp.event) ? trp.value : nil
       end
-      
+
       def tp_raised_exception(trp)
         trp.event == :raise && trp.raised_exception
       end
-      
+
       def analyze(records)
         by_fiber = Hash.new { |h, f| h[f] = [] }
         records.each_with_object(by_fiber) { |r, h| h[r[:fiber]] << r }
         { by_fiber: by_fiber }
       end
-      
+
       # Implements fake TracePoint instances for fiber-related events
       class FiberTracePoint
         attr_reader :event, :fiber, :value
-      
+
         def initialize(tpoint)
           @tp = tpoint
           @event = tpoint.return_value[0]
           @fiber = tpoint.return_value[1]
           @value = tpoint.return_value[2]
         end
-      
+
         def lineno
           @tp.lineno
         end
-      
+
         def method_id
           @tp.method_id
         end
-      
+
         def path
           @tp.path
         end
-      
+
         def self
           @tp.self
         end
-      
+
         def binding
           @tp.binding
         end
       end
-      
+
       class << ::TracePoint
         POLYPHONY_FILE_REGEXP = /^#{::Exception::POLYPHONY_DIR}/.freeze
-      
+
         alias_method :orig_new, :new
         def new(*args, &block)
           events_mask, fiber_events_mask = event_masks(args)
-      
+
           orig_new(*events_mask) do |tp|
             handle_tp_event(tp, fiber_events_mask, &block)
           end
         end
-      
+
         def handle_tp_event(tpoint, fiber_events_mask)
           # next unless !$watched_fiber || Fiber.current == $watched_fiber
-      
+
           if tpoint.method_id == :__fiber_trace__
             return if tpoint.event != :c_return
             return unless fiber_events_mask.include?(tpoint.return_value[0])
-      
+
             tpoint = FiberTracePoint.new(tpoint)
           elsif tpoint.path =~ POLYPHONY_FILE_REGEXP
             return
           end
-      
+
           yield tpoint
         end
-      
+
         ALL_FIBER_EVENTS = %i[
           fiber_create fiber_terminate fiber_schedule fiber_switchpoint fiber_run
           fiber_ev_loop_enter fiber_ev_loop_leave
         ].freeze
-      
+
         def event_masks(events)
           events.each_with_object([[], []]) do |e, masks|
             case e
@@ -135,4 +136,3 @@ module Polyphony
     end
   end
 end
-

data/lib/polyphony/core/channel.rb

@@ -26,7 +26,7 @@ module Polyphony
     end
 
     def receive
-      Gyro.ref
+      Thread.current.agent.ref
       if @payload_queue.empty?
         @waiting_queue << Fiber.current
         suspend
@@ -34,7 +34,7 @@ module Polyphony
         receive_from_queue
       end
     ensure
-      Gyro.unref
+      Thread.current.agent.unref
     end
 
     def receive_from_queue
@@ -43,4 +43,4 @@ module Polyphony
       payload
     end
   end
-end
+end

data/lib/polyphony/core/exceptions.rb

@@ -33,4 +33,4 @@ module Polyphony
 
   # Restart is used to restart a fiber
   class Restart < BaseException; end
-end
+end

data/lib/polyphony/core/global_api.rb

@@ -45,13 +45,16 @@ module Polyphony
     end
 
     def every(interval)
-      timer = Gyro::Timer.new(interval, interval)
+      next_time = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC) + interval
       loop do
-        timer.await
+        now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+        Thread.current.agent.sleep(next_time - now)
         yield
+        loop do
+          next_time += interval
+          break if next_time > now
+        end
       end
-    ensure
-      timer.stop
     end
 
     def move_on_after(interval, with_value: nil, &block)
@@ -93,28 +96,27 @@ module Polyphony
     def sleep(duration = nil)
       return sleep_forever unless duration
 
-      timer = Gyro::Timer.new(duration, 0)
-      timer.await
+      Thread.current.agent.sleep duration
     end
 
     def sleep_forever
-      Thread.current.fiber_ref
+      Thread.current.agent.ref
       suspend
     ensure
-      Thread.current.fiber_unref
+      Thread.current.agent.unref
     end
 
     def throttled_loop(rate, count: nil, &block)
       throttler = Polyphony::Throttler.new(rate)
       if count
-        count.times { throttler.(&block) }
+        count.times { |_i| throttler.(&block) }
       else
         loop { throttler.(&block) }
       end
     ensure
-      throttler.stop
+      throttler&.stop
     end
   end
 end
 
-Object.include Polyphony::GlobalAPI
+Object.include Polyphony::GlobalAPI

data/lib/polyphony/core/resource_pool.rb

@@ -23,13 +23,13 @@ module Polyphony
     end
 
     def acquire
-      Gyro.ref
+      Thread.current.agent.ref
       resource = wait_for_resource
       return unless resource
 
       yield resource
     ensure
-      Gyro.unref
+      Thread.current.agent.unref
       release(resource) if resource
     end
 
@@ -104,4 +104,4 @@ module Polyphony
       (@limit - @size).times { @stock << allocate }
     end
   end
-end
+end