polyphony 0.63 → 0.67

data/ext/polyphony/runqueue_ring_buffer.h

@@ -29,4 +29,6 @@ void runqueue_ring_buffer_push(runqueue_ring_buffer *buffer, VALUE fiber, VALUE
 void runqueue_ring_buffer_delete(runqueue_ring_buffer *buffer, VALUE fiber);
 int runqueue_ring_buffer_index_of(runqueue_ring_buffer *buffer, VALUE fiber);
 
+void runqueue_ring_buffer_migrate(runqueue_ring_buffer *src, runqueue_ring_buffer *dest, VALUE fiber);
+
 #endif /* RUNQUEUE_RING_BUFFER_H */

data/ext/polyphony/thread.c

@@ -22,14 +22,12 @@ VALUE Thread_fiber_unschedule(VALUE self, VALUE fiber) {
   return self;
 }
 
-VALUE Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
+inline void Thread_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
   schedule_fiber(self, fiber, value, 0);
-  return self;
 }
 
-VALUE Thread_schedule_fiber_with_priority(VALUE self, VALUE fiber, VALUE value) {
+inline void Thread_schedule_fiber_with_priority(VALUE self, VALUE fiber, VALUE value) {
   schedule_fiber(self, fiber, value, 1);
-  return self;
 }
 
 VALUE Thread_switch_fiber(VALUE self) {
@@ -61,10 +59,6 @@ VALUE Thread_class_backend(VALUE _self) {
 void Init_Thread() {
   rb_define_method(rb_cThread, "setup_fiber_scheduling", Thread_setup_fiber_scheduling, 0);
   rb_define_method(rb_cThread, "schedule_and_wakeup", Thread_fiber_schedule_and_wakeup, 2);
-
-  rb_define_method(rb_cThread, "schedule_fiber", Thread_schedule_fiber, 2);
-  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_unschedule", Thread_fiber_unschedule, 1);
 

data/lib/polyphony.rb

@@ -121,3 +121,9 @@ end
 
 Polyphony.install_terminating_signal_handlers
 Polyphony.install_at_exit_handler
+
+if (debug_socket_path = ENV['POLYPHONY_DEBUG_SOCKET_PATH'])
+  puts "Starting debug server on #{debug_socket_path}"
+  require 'polyphony/debugger/server'
+  Polyphony::DebugServer.start(debug_socket_path)
+end

data/lib/polyphony/debugger/server.rb

@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+require 'polyphony/extensions/debug'
+
+module Polyphony
+  class DebugServer
+    TP_EVENTS = [
+      :line,
+      :call,
+      :return,
+      :b_call,
+      :b_return
+    ]
+    
+    
+    def self.start(socket_path)
+      server = self.new(socket_path)
+      server.start
+    
+      trace = TracePoint.new(*TP_EVENTS) { |tp| server.handle_tp(trace, tp) }
+      trace.enable
+
+      at_exit do
+        puts "program terminated"
+        trace.disable
+        server.stop
+      end
+    end
+
+    def initialize(socket_path)
+      @socket_path = socket_path
+      @fiber = Fiber.current
+      @controller = spin { control_loop }
+      puts "@fiber: #{@fiber.inspect}"
+    end
+
+    def start
+      fiber = Fiber.current
+      @server = spin(:pdbg_server) do
+        puts("Listening on #{@socket_path}")
+        FileUtils.rm(@socket_path) if File.exists?(@socket_path)
+        socket = UNIXServer.new(@socket_path)
+        fiber << :ready
+        id = 0
+        socket.accept_loop do |client|
+          puts "accepted connection"
+          handle_client(client)
+        end
+      end
+      receive
+    end
+
+    def stop
+      @server.terminate
+      @controller.terminate
+    end
+
+    POLYPHONY_LIB_DIR = File.expand_path('../..', __dir__)
+    def handle_client(client)
+      @client = client
+      puts "trace enabled"
+    end
+
+    def control_loop
+      @cmd = :step
+      loop do
+        case @cmd
+        when :step
+          step
+        end
+      end
+    end
+
+    def step
+      tp = nil
+      fiber = nil
+      while true
+        event = receive
+        fiber = event[:fiber]
+        if fiber == @fiber && event[:kind] == :line && event[:path] !~ /#{POLYPHONY_LIB_DIR}/
+          interact_with_client(event)
+          fiber << :ok
+          fiber.__unpark__
+          return
+        end
+          
+        fiber << :ok
+        fiber.__unpark__
+      end
+    rescue => e
+      puts "Uncaught error: #{e.inspect}"
+      @trace&.disable
+      @client = nil
+    end
+
+    def interact_with_client(event)
+      @client.puts event.inspect
+      result = @client.gets&.chomp
+    end
+
+    def handle_tp(trace, tp)
+      return if @in_handle_tp
+
+      process_tp(trace, tp)
+    end
+
+    def process_tp(trace, tp)
+      @in_handle_tp = true
+      if !@client
+        wait_for_client
+      end
+
+      puts "- #{tp.event} #{tp.path}:#{tp.lineno}"
+
+      fiber = Fiber.current
+      fiber.__park__
+
+      @controller << {
+        fiber: fiber,
+        kind: tp.event,
+        path: tp.path,
+        lineno: tp.lineno
+      }
+      receive
+    ensure
+      @in_handle_tp = nil
+    end
+
+    def wait_for_client
+      puts "wait_for_client"
+      sleep 0.1 until @client
+      puts "  got client!"
+      msg = @client.gets
+      @client.puts msg
+    end
+  end
+end

data/lib/polyphony/extensions/debug.rb

@@ -10,4 +10,4 @@ module ::Kernel
       format("%p\n", args.size == 1 ? args.first : args)
     end
   end
-end
+end

data/lib/polyphony/extensions/fiber.rb

@@ -7,6 +7,10 @@ require_relative '../core/exceptions'
 module Polyphony
   # Fiber control API
   module FiberControl
+    def monitor_mailbox
+      @monitor_mailbox ||= Polyphony::Queue.new
+    end
+
     def interrupt(value = nil)
       return if @running == false
 
@@ -124,23 +128,24 @@ module Polyphony
     def await(*fibers)
       return [] if fibers.empty?
 
-      Fiber.current.message_on_child_termination = true
+      current_fiber = self.current
+      mailbox = current_fiber.monitor_mailbox
       results = {}
       fibers.each do |f|
         results[f] = nil
         if f.dead?
           # fiber already terminated, so queue message
-          Fiber.current.send [f, f.result]
+          mailbox << [f, f.result]
         else
-          f.monitor
+          f.monitor(current_fiber)
         end
       end
       exception = nil
       while !fibers.empty?
-        (fiber, result) = receive
+        (fiber, result) = mailbox.shift
         next unless fibers.include?(fiber)
-
         fibers.delete(fiber)
+        current_fiber.remove_child(fiber) if fiber.parent == current_fiber
         if result.is_a?(Exception)
           exception ||= result
           fibers.each { |f| f.terminate }
@@ -148,16 +153,16 @@ module Polyphony
           results[fiber] = result
         end
       end
-      results.values
-    ensure
-      Fiber.current.message_on_child_termination = false
       raise exception if exception
+      results.values
     end
     alias_method :join, :await
 
     def select(*fibers)
       return nil if fibers.empty?
   
+      current_fiber = self.current
+      mailbox = current_fiber.monitor_mailbox
       fibers.each do |f|
         if f.dead?
           result = f.result
@@ -165,21 +170,18 @@ module Polyphony
         end
       end
 
-      Fiber.current.message_on_child_termination = true
-      fibers.each { |f| f.monitor }
+      fibers.each { |f| f.monitor(current_fiber) }
       while true
-        (fiber, result) = receive
+        (fiber, result) = mailbox.shift
         next unless fibers.include?(fiber)
   
-        fibers.each { |f| f.unmonitor }
+        fibers.each { |f| f.unmonitor(current_fiber) }
         if result.is_a?(Exception)
           raise result
         else
           return [fiber, result]
         end
       end
-    ensure
-      Fiber.current.message_on_child_termination = false
     end
 
     # Creates and schedules with priority an out-of-band fiber that runs the
@@ -219,14 +221,6 @@ module Polyphony
       f
     end
 
-    def child_done(child_fiber, result)
-      @children.delete(child_fiber)
-
-      if result.is_a?(Exception) && !@message_on_child_termination
-        schedule_with_priority(result)
-      end
-    end
-
     def terminate_all_children(graceful = false)
       return unless @children
 
@@ -240,16 +234,25 @@ module Polyphony
     def await_all_children
       return unless @children && !@children.empty?
 
-      Fiber.await(*@children.keys)
+      Fiber.await(*@children.keys.reject { |c| c.dead? })
     end
 
     def shutdown_all_children(graceful = false)
       return unless @children
 
       @children.keys.each do |c|
+        next if c.dead?
+
         c.terminate(graceful)
         c.await
       end
+      reap_dead_children
+    end
+
+    def reap_dead_children
+      return unless @children
+
+      @children.reject! { |f| f.dead? }
     end
 
     def detach
@@ -323,7 +326,7 @@ module Polyphony
       Thread.backend.trace(:fiber_terminate, self, result)
       @result = result
 
-      inform_dependants(result, uncaught_exception)
+      inform_monitors(result, uncaught_exception)
       @running = false
     ensure
       # Prevent fiber from being resumed after terminating
@@ -341,24 +344,28 @@ module Polyphony
       [e, true]
     end
 
-    def inform_dependants(result, uncaught_exception)
+    def inform_monitors(result, uncaught_exception)
       if @monitors
         msg = [self, result]
-        @monitors.each { |f| f << msg }
+        @monitors.each_key { |f| f.monitor_mailbox << msg }
       end
 
-      @parent&.child_done(self, result)
+      if uncaught_exception && @parent
+        parent_is_monitor = @monitors&.has_key?(@parent)
+        @parent.schedule_with_priority(result) unless parent_is_monitor
+      end
     end
 
-    attr_accessor :message_on_child_termination 
+    def monitor(fiber)
+      (@monitors ||= {})[fiber] = true
+    end
 
-    def monitor
-      @monitors ||= []
-      @monitors << Fiber.current
+    def unmonitor(fiber)
+      (@monitors ||= []).delete(fiber)
     end
 
-    def unmonitor
-      @monitors.delete(Fiber.current) if @monitors
+    def monitors
+      @monitors&.keys || []
     end
 
     def dead?

data/lib/polyphony/extensions/io.rb

@@ -76,6 +76,10 @@ end
 
 # IO instance method patches
 class ::IO
+  def __polyphony_read_method__
+    :backend_read
+  end
+
   # def each(sep = $/, limit = nil, chomp: nil)
   #   sep, limit = $/, sep if sep.is_a?(Integer)
   # end
@@ -123,9 +127,9 @@ class ::IO
   end
 
   alias_method :orig_readpartial, :read
-  def readpartial(len, str = +'', buffer_pos = 0)
+  def readpartial(len, str = +'', buffer_pos = 0, raise_on_eof = true)
     result = Polyphony.backend_read(self, str, len, false, buffer_pos)
-    raise EOFError unless result
+    raise EOFError if !result && raise_on_eof
 
     result
   end

data/lib/polyphony/extensions/openssl.rb

@@ -5,6 +5,10 @@ require_relative './socket'
 
 # OpenSSL socket helper methods (to make it compatible with Socket API) and overrides
 class ::OpenSSL::SSL::SSLSocket
+  def __polyphony_read_method__
+    :readpartial
+  end
+
   alias_method :orig_initialize, :initialize
   def initialize(socket, context = nil)
     socket = socket.respond_to?(:io) ? socket.io || socket : socket
@@ -78,7 +82,7 @@ class ::OpenSSL::SSL::SSLSocket
     buf
   end
 
-  def readpartial(maxlen, buf = +'', buffer_pos = 0)
+  def readpartial(maxlen, buf = +'', buffer_pos = 0, raise_on_eof = true)
     if buffer_pos != 0
       if (result = sysread(maxlen, +''))
         if buffer_pos == -1
@@ -90,7 +94,9 @@ class ::OpenSSL::SSL::SSLSocket
     else
       result = sysread(maxlen, buf)
     end
-    result || (raise EOFError)
+
+    raise EOFError if !result && raise_on_eof
+    result
   end
 
   def read_loop(maxlen = 8192)

data/lib/polyphony/extensions/socket.rb

@@ -5,6 +5,12 @@ require 'socket'
 require_relative './io'
 require_relative '../core/thread_pool'
 
+class BasicSocket
+  def __polyphony_read_method__
+    :backend_recv
+  end
+end
+
 # Socket overrides (eventually rewritten in C)
 class ::Socket
   def accept
@@ -77,8 +83,9 @@ class ::Socket
   #   Polyphony.backend_send(self, mesg, 0)
   # end
 
-  def readpartial(maxlen, str = +'', buffer_pos = 0)
-    Polyphony.backend_recv(self, str, maxlen, buffer_pos)
+  def readpartial(maxlen, str = +'', buffer_pos = 0, raise_on_eof = true)
+    result = Polyphony.backend_recv(self, str, maxlen, buffer_pos)
+    raise EOFError if !result && raise_on_eof
   end
 
   ZERO_LINGER = [0, 0].pack('ii').freeze
@@ -199,11 +206,10 @@ class ::TCPSocket
   #   Polyphony.backend_send(self, mesg, 0)
   # end
 
-  def readpartial(maxlen, str = +'', buffer_pos = 0)
+  def readpartial(maxlen, str = +'', buffer_pos = 0, raise_on_eof)
     result = Polyphony.backend_recv(self, str, maxlen, buffer_pos)
-    raise EOFError unless result
-
-    str
+    raise EOFError if !result && raise_on_eof
+    result
   end
 
   def read_nonblock(len, str = nil, exception: true)
@@ -293,11 +299,10 @@ class ::UNIXSocket
     Polyphony.backend_send(self, mesg, 0)
   end
 
-  def readpartial(maxlen, str = +'', buffer_pos = 0)
+  def readpartial(maxlen, str = +'', buffer_pos = 0, raise_on_eof)
     result = Polyphony.backend_recv(self, str, maxlen, buffer_pos)
-    raise EOFError unless result
-
-    str
+    raise EOFError if !result && raise_on_eof
+    result
   end
 
   def read_nonblock(len, str = nil, exception: true)