polyphony 0.49.0 → 0.51.0

data/ext/polyphony/fiber.c

@@ -101,7 +101,8 @@ VALUE Fiber_await(VALUE self) {
   }
   rb_hash_aset(waiting_fibers, fiber, Qtrue);
 
-  result = Thread_switch_fiber(rb_thread_current());
+  VALUE backend = rb_ivar_get(rb_thread_current(), ID_ivar_backend);
+  result = Backend_wait_event(backend, Qnil);
 
   rb_hash_delete(waiting_fibers, fiber);
   RAISE_IF_EXCEPTION(result);

data/ext/polyphony/polyphony.h

@@ -84,6 +84,7 @@ void Runqueue_push(VALUE self, VALUE fiber, VALUE value, int reschedule);
 void Runqueue_unshift(VALUE self, VALUE fiber, VALUE value, int reschedule);
 runqueue_entry Runqueue_shift(VALUE self);
 void Runqueue_delete(VALUE self, VALUE fiber);
+int Runqueue_index_of(VALUE self, VALUE fiber);
 void Runqueue_clear(VALUE self);
 long Runqueue_len(VALUE self);
 int Runqueue_empty_p(VALUE self);

data/ext/polyphony/runqueue.c

@@ -74,6 +74,12 @@ void Runqueue_delete(VALUE self, VALUE fiber) {
   runqueue_ring_buffer_delete(&runqueue->entries, fiber);
 }
 
+int Runqueue_index_of(VALUE self, VALUE fiber) {
+  Runqueue_t *runqueue;
+  GetRunqueue(self, runqueue);
+  return runqueue_ring_buffer_index_of(&runqueue->entries, fiber);
+}
+
 void Runqueue_clear(VALUE self) {
   Runqueue_t *runqueue;
   GetRunqueue(self, runqueue);

data/ext/polyphony/runqueue_ring_buffer.c

@@ -80,6 +80,15 @@ void runqueue_ring_buffer_delete(runqueue_ring_buffer *buffer, VALUE fiber) {
   }
 }
 
+int runqueue_ring_buffer_index_of(runqueue_ring_buffer *buffer, VALUE fiber) {
+  for (unsigned int i = 0; i < buffer->count; i++) {
+    unsigned int idx = (buffer->head + i) % buffer->size;
+    if (buffer->entries[idx].fiber == fiber)
+      return i;
+  }
+  return -1;
+}
+
 void runqueue_ring_buffer_clear(runqueue_ring_buffer *buffer) {
   buffer->count = buffer->head = buffer->tail = 0;
 }

data/ext/polyphony/runqueue_ring_buffer.h

@@ -27,5 +27,6 @@ void runqueue_ring_buffer_unshift(runqueue_ring_buffer *buffer, VALUE fiber, VAL
 void runqueue_ring_buffer_push(runqueue_ring_buffer *buffer, VALUE fiber, VALUE value);
 
 void runqueue_ring_buffer_delete(runqueue_ring_buffer *buffer, VALUE fiber);
+int runqueue_ring_buffer_index_of(runqueue_ring_buffer *buffer, VALUE fiber);
 
 #endif /* RUNQUEUE_RING_BUFFER_H */

data/ext/polyphony/thread.c

@@ -59,6 +59,18 @@ void schedule_fiber(VALUE self, VALUE fiber, VALUE value, int prioritize) {
   }
 }
 
+VALUE Thread_fiber_scheduling_index(VALUE self, VALUE fiber) {
+  VALUE runqueue = rb_ivar_get(self, ID_ivar_runqueue);
+
+  return INT2NUM(Runqueue_index_of(runqueue, fiber));
+}
+
+VALUE Thread_fiber_unschedule(VALUE self, VALUE fiber) {
+  VALUE runqueue = rb_ivar_get(self, ID_ivar_runqueue);
+  Runqueue_delete(runqueue, fiber);
+  return self;
+}
+
 VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
   schedule_fiber(self, fiber, value, 0);
   return self;
@@ -135,6 +147,8 @@ void Init_Thread() {
   rb_define_method(rb_cThread, "schedule_fiber_with_priority",
     Thread_schedule_fiber_with_priority, 2);
   rb_define_method(rb_cThread, "switch_fiber", Thread_switch_fiber, 0);
+  rb_define_method(rb_cThread, "fiber_scheduling_index", Thread_fiber_scheduling_index, 1);
+  rb_define_method(rb_cThread, "fiber_unschedule", Thread_fiber_unschedule, 1);
 
   rb_define_method(rb_cThread, "debug!", Thread_debug, 0);
 

data/lib/polyphony.rb

@@ -44,7 +44,7 @@ module Polyphony
       rescue SystemExit
         # fall through to ensure
       rescue Exception => e
-        warn e.full_message
+        STDERR << e.full_message
         exit!
       ensure
         exit_forked_process

data/lib/polyphony/adapters/process.rb

@@ -24,6 +24,8 @@ module Polyphony
       def kill_and_await(sig, pid)
         ::Process.kill(sig, pid)
         Thread.current.backend.waitpid(pid)
+      rescue Errno::ESRCH
+        # process doesn't exist
       end
     end
   end

data/lib/polyphony/core/exceptions.rb

@@ -13,6 +13,7 @@ module Polyphony
     def initialize(value = nil)
       @caller_backtrace = caller
       @value = value
+      super
     end
   end
 

data/lib/polyphony/core/global_api.rb

@@ -29,7 +29,7 @@ module Polyphony
       spin do
         sleep interval
         exception = cancel_exception(with_exception)
-        exception.__raising_fiber__ = nil
+        exception.raising_fiber = nil
         fiber.schedule exception
       end
     end

data/lib/polyphony/core/timer.rb

@@ -11,12 +11,45 @@ module Polyphony
     def stop
       @fiber.stop
     end
+
+    def sleep(duration)
+      fiber = Fiber.current
+      @timeouts[fiber] = {
+        interval: duration,
+        target_stamp: now + duration
+      }
+      Thread.current.backend.wait_event(true)
+    ensure
+      @timeouts.delete(fiber)
+    end
+
+    def after(interval, &block)
+      spin do
+        self.sleep interval
+        block.()
+      end
+    end
+
+    def every(interval)
+      fiber = Fiber.current
+      @timeouts[fiber] = {
+        interval: interval,
+        target_stamp: now + interval,
+        recurring: true
+      }
+      while true
+        Thread.current.backend.wait_event(true)
+        yield
+      end
+    ensure
+      @timeouts.delete(fiber)
+    end
   
-    def cancel_after(duration, with_exception: Polyphony::Cancel)
+    def cancel_after(interval, with_exception: Polyphony::Cancel)
       fiber = Fiber.current
       @timeouts[fiber] = {
-        duration: duration,
-        target_stamp: Time.now + duration,
+        interval: interval,
+        target_stamp: now + interval,
         exception: with_exception
       }
       yield
@@ -24,12 +57,12 @@ module Polyphony
       @timeouts.delete(fiber)
     end
 
-    def move_on_after(duration, with_value: nil)
+    def move_on_after(interval, with_value: nil)
       fiber = Fiber.current
       @timeouts[fiber] = {
-        duration: duration,
-        target_stamp: Time.now + duration,
-        value: with_value
+        interval: interval,
+        target_stamp: now + interval,
+        exception: [Polyphony::MoveOn, with_value]
       }
       yield
     rescue Polyphony::MoveOn => e
@@ -37,36 +70,46 @@ module Polyphony
     ensure
       @timeouts.delete(fiber)
     end
-  
+
     def reset
       record = @timeouts[Fiber.current]
       return unless record
   
-      record[:target_stamp] = Time.now + record[:duration]
+      record[:target_stamp] = now + record[:interval]
     end
-  
+
     private
 
+    def now
+      ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+    end
+
     def timeout_exception(record)
       case (exception = record[:exception])
-      when Class then exception.new
-      when Array then exception[0].new(exception[1])
-      when nil then Polyphony::MoveOn.new(record[:value])
-      else RuntimeError.new(exception)
+      when Array
+        exception[0].new(exception[1])
+      when Class
+        exception.new
+      else
+        RuntimeError.new(exception)
       end
     end
 
     def update
-      now = Time.now
-      # elapsed = nil
+      return if @timeouts.empty?
+
       @timeouts.each do |fiber, record|
         next if record[:target_stamp] > now
 
-        exception = timeout_exception(record)
-        # (elapsed ||= []) << fiber
-        fiber.schedule exception
+        value = record[:exception] ? timeout_exception(record) : record[:value]
+        fiber.schedule value
+
+        next unless record[:recurring]
+
+        while record[:target_stamp] <= now
+          record[:target_stamp] += record[:interval]
+        end
       end
-      # elapsed&.each { |f| @timeouts.delete(f) }
     end
   end
 end

data/lib/polyphony/extensions/core.rb

@@ -12,11 +12,11 @@ class ::Exception
     attr_accessor :__disable_sanitized_backtrace__
   end
 
-  attr_accessor :source_fiber, :__raising_fiber__
+  attr_accessor :source_fiber, :raising_fiber
 
   alias_method :orig_initialize, :initialize
   def initialize(*args)
-    @__raising_fiber__ = Fiber.current
+    @raising_fiber = Fiber.current
     orig_initialize(*args)
   end
 
@@ -31,10 +31,10 @@ class ::Exception
   end
 
   def sanitized_backtrace
-    return sanitize(orig_backtrace) unless @__raising_fiber__
+    return sanitize(orig_backtrace) unless @raising_fiber
 
     backtrace = orig_backtrace || []
-    sanitize(backtrace + @__raising_fiber__.caller)
+    sanitize(backtrace + @raising_fiber.caller)
   end
 
   POLYPHONY_DIR = File.expand_path(File.join(__dir__, '..'))

data/lib/polyphony/extensions/fiber.rb

@@ -245,8 +245,12 @@ module Polyphony
     end
 
     def shutdown_all_children(graceful = false)
-      terminate_all_children(graceful)
-      await_all_children
+      return unless @children
+
+      @children.keys.each do |c|
+        c.terminate(graceful)
+        c.await
+      end
     end
   end
 
@@ -312,6 +316,8 @@ module Polyphony
       @running = false
       inform_dependants(result, uncaught_exception)
     ensure
+      # Prevent fiber from being resumed after terminating
+      @thread.fiber_unschedule(self)
       Thread.current.switch_fiber
     end
 
@@ -319,13 +325,10 @@ module Polyphony
     # the children are shut down, it is returned along with the uncaught_exception
     # flag set. Otherwise, it returns the given arguments.
     def finalize_children(result, uncaught_exception)
-      begin
-        shutdown_all_children
-      rescue Exception => e
-        result = e
-        uncaught_exception = true
-      end
+      shutdown_all_children
       [result, uncaught_exception]
+    rescue Exception => e
+      [e, true]
     end
 
     def inform_dependants(result, uncaught_exception)

data/lib/polyphony/extensions/io.rb

@@ -220,6 +220,10 @@ class ::IO
     Thread.current.backend.read_loop(self, &block)
   end
 
+  def feed_loop(receiver, method, &block)
+    Thread.current.backend.feed_loop(self, receiver, method, &block)
+  end
+
   # alias_method :orig_read, :read
   # def read(length = nil, outbuf = nil)
   #   if length

data/lib/polyphony/extensions/socket.rb

@@ -31,6 +31,10 @@ class ::Socket
   end
   alias_method :read_loop, :recv_loop
 
+  def feed_loop(receiver, method, &block)
+    Thread.current.backend.recv_feed_loop(self, receiver, method, &block)
+  end
+
   def recvfrom(maxlen, flags = 0)
     @read_buffer ||= +''
     while true
@@ -146,6 +150,10 @@ class ::TCPSocket
   end
   alias_method :read_loop, :recv_loop
 
+  def feed_loop(receiver, method, &block)
+    Thread.current.backend.recv_feed_loop(self, receiver, method, &block)
+  end
+
   def send(mesg, flags = 0)
     Thread.current.backend.send(self, mesg)
   end
@@ -227,6 +235,10 @@ class ::UNIXSocket
   end
   alias_method :read_loop, :recv_loop
 
+  def feed_loop(receiver, method, &block)
+    Thread.current.backend.recv_feed_loop(self, receiver, method, &block)
+  end
+
   def send(mesg, flags = 0)
     Thread.current.backend.send(self, mesg)
   end

data/lib/polyphony/extensions/thread.rb

@@ -41,8 +41,7 @@ class ::Thread
 
   def finalize(result)
     unless Fiber.current.children.empty?
-      Fiber.current.terminate_all_children
-      Fiber.current.await_all_children
+      Fiber.current.shutdown_all_children
     end
     @finalization_mutex.synchronize do
       @terminated = true

data/lib/polyphony/net.rb

@@ -8,10 +8,7 @@ module Polyphony
   module Net
     class << self
       def tcp_connect(host, port, opts = {})
-        socket = ::Socket.new(:INET, :STREAM).tap do |s|
-          addr = ::Socket.sockaddr_in(port, host)
-          s.connect(addr)
-        end
+        socket = TCPSocket.new(host, port)
         if opts[:secure_context] || opts[:secure]
           secure_socket(socket, opts[:secure_context], opts.merge(host: host))
         else
@@ -23,7 +20,7 @@ module Polyphony
         host ||= '0.0.0.0'
         raise 'Port number not specified' unless port
 
-        socket = socket_from_options(host, port, opts)
+        socket = listening_socket_from_options(host, port, opts)
         if opts[:secure_context] || opts[:secure]
           secure_server(socket, opts[:secure_context], opts)
         else
@@ -31,7 +28,7 @@ module Polyphony
         end
       end
 
-      def socket_from_options(host, port, opts)
+      def listening_socket_from_options(host, port, opts)
         ::Socket.new(:INET, :STREAM).tap do |s|
           s.reuse_addr if opts[:reuse_addr]
           s.dont_linger if opts[:dont_linger]

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'rubocop',              '0.85.1'
   s.add_development_dependency  'pry',                  '0.13.1'
   
+  s.add_development_dependency  'msgpack',              '1.4.2'
   s.add_development_dependency  'pg',                   '1.1.4'
   s.add_development_dependency  'redis',                '4.1.0'
   s.add_development_dependency  'hiredis',              '0.6.3'

data/test/helper.rb

@@ -57,8 +57,7 @@ class MiniTest::Test
 
   def teardown
     # trace "* teardown #{self.name}"
-    Fiber.current.terminate_all_children
-    Fiber.current.await_all_children
+    Fiber.current.shutdown_all_children
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e

data/test/test_backend.rb

@@ -100,6 +100,31 @@ class BackendTest < MiniTest::Test
     assert_equal [:ready, 'foo', 'bar', :done], buf
   end
 
+  def test_read_loop_terminate
+    i, o = IO.pipe
+
+    buf = []
+    parent = spin do
+      f = spin do
+        buf << :ready
+        @backend.read_loop(i) { |d| buf << d }
+        buf << :done
+      end
+      suspend
+    end
+
+    # writing always causes snoozing
+    o << 'foo'
+    sleep 0.01
+    o << 'bar'
+    sleep 0.01
+
+    parent.stop
+
+    parent.await
+    assert_equal [:ready, 'foo', 'bar'], buf
+  end
+
   def test_accept_loop
     server = TCPServer.new('127.0.0.1', 1234)