polyphony 0.72 → 0.75

data/lib/polyphony/extensions/process.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Overrides for Process
+module ::Process
+  class << self
+    alias_method :orig_detach, :detach
+    def detach(pid)
+      fiber = spin { Polyphony.backend_waitpid(pid) }
+      fiber.define_singleton_method(:pid) { pid }
+      fiber
+    end
+
+    alias_method :orig_daemon, :daemon
+    def daemon(*args)
+      orig_daemon(*args)
+      Polyphony.original_pid = Process.pid
+    end
+  end
+end

data/lib/polyphony/extensions/socket.rb

@@ -31,7 +31,7 @@ class ::Socket
   alias_method :orig_read, :read
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
-    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    return Polyphony.backend_recv(self, +'', maxlen, 0) if maxlen
 
     buf = +''
     len = buf.bytesize
@@ -120,8 +120,13 @@ class ::TCPSocket
 
   attr_reader :io
 
+  def self.open(*args)
+    new(*args)
+  end
+
   def initialize(remote_host, remote_port, local_host = nil, local_port = nil)
-    @io = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
+    remote_addr = Addrinfo.tcp(remote_host, remote_port)
+    @io = Socket.new remote_addr.afamily, Socket::SOCK_STREAM
     if local_host && local_port
       addr = Addrinfo.tcp(local_host, local_port)
       @io.bind(addr)
@@ -167,7 +172,7 @@ class ::TCPSocket
   alias_method :orig_read, :read
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
-    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    return Polyphony.backend_recv(self, +'', maxlen, 0) if maxlen
 
     buf = +''
     len = buf.bytesize
@@ -224,8 +229,9 @@ end
 # Override stock TCPServer code by encapsulating a Socket instance.
 class ::TCPServer
   def initialize(hostname = nil, port = 0)
-    @io = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
-    @io.bind(Addrinfo.tcp(hostname, port))
+    addr = Addrinfo.tcp(hostname, port)
+    @io = Socket.new addr.afamily, Socket::SOCK_STREAM
+    @io.bind(addr)
     @io.listen(0)
   end
 
@@ -259,7 +265,7 @@ class ::UNIXSocket
   alias_method :orig_read, :read
   def read(maxlen = nil, buf = nil, buf_pos = 0)
     return Polyphony.backend_recv(self, buf, maxlen, buf_pos) if buf
-    return Polyphony.backend_recv(self, buf || +'', maxlen, 0) if maxlen
+    return Polyphony.backend_recv(self, +'', maxlen, 0) if maxlen
 
     buf = +''
     len = buf.bytesize

data/lib/polyphony/extensions/thread.rb

@@ -18,14 +18,20 @@ class ::Thread
   def execute
     # backend must be created in the context of the new thread, therefore it
     # cannot be created in Thread#initialize
-    @backend = Polyphony::Backend.new
+    raise_error = false
+    begin
+      @backend = Polyphony::Backend.new
+    rescue Exception => e
+      raise_error = true
+      raise e
+    end
     setup
     @ready = true
     result = @block.(*@args)
   rescue Polyphony::MoveOn, Polyphony::Terminate => e
     result = e.value
   rescue Exception => e
-    result = e
+    raise_error ? (raise e) : (result = e)
   ensure
     @ready = true
     finalize(result)
@@ -48,7 +54,7 @@ class ::Thread
       @result = result
       signal_waiters(result)
     end
-    @backend.finalize
+    @backend&.finalize
   end
 
   def signal_waiters(result)

data/lib/polyphony/extensions/timeout.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'timeout'
+
+# Override Timeout to use cancel scope
+module ::Timeout
+  def self.timeout(sec, klass = Timeout::Error, message = 'execution expired', &block)
+    cancel_after(sec, with_exception: [klass, message], &block)
+  end
+end

data/lib/polyphony/extensions.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative './extensions/exception'
+require_relative './extensions/fiber'
+require_relative './extensions/io'
+require_relative './extensions/kernel'
+require_relative './extensions/process'
+require_relative './extensions/thread'
+require_relative './extensions/timeout'

data/lib/polyphony/version.rb

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

data/lib/polyphony.rb

@@ -2,15 +2,13 @@
 
 require 'fiber'
 require_relative './polyphony_ext'
-
-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.backend = Polyphony::Backend.new
 
+require_relative './polyphony/extensions'
+require_relative './polyphony/core/exceptions'
 require_relative './polyphony/core/global_api'
 require_relative './polyphony/core/resource_pool'
 require_relative './polyphony/core/sync'
@@ -43,6 +41,8 @@ module Polyphony
         run_forked_block(&block)
       rescue SystemExit
         # fall through to ensure
+      rescue Polyphony::MoveOn
+        exit!
       rescue Exception => e
         STDERR << e.full_message
         exit!

data/test/helper.rb

@@ -21,10 +21,6 @@ IS_LINUX = RUBY_PLATFORM =~ /linux/
 #   Minitest::Reporters::SpecReporter.new
 # ]
 
-class ::Fiber
-  attr_writer :auto_watcher
-end
-
 module ::Kernel
   def trace(*args)
     STDOUT.orig_write(format_trace(args))
@@ -59,7 +55,6 @@ class MiniTest::Test
       puts "Children left after #{self.name}: #{Fiber.current.children.inspect}"
       exit!
     end
-    Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e
     puts e.backtrace.join("\n")

data/test/test_backend.rb

@@ -243,16 +243,14 @@ class BackendTest < MiniTest::Test
   end
 
   def test_timer_loop
-    skip unless IS_LINUX
-
-    i = 0
+    counter = 0
     f = spin do
-      @backend.timer_loop(0.01) { i += 1 }
+      @backend.timer_loop(0.01) { counter += 1 }
     end
     @backend.sleep(0.05)
     f.stop
     f.await # TODO: check why this test sometimes segfaults if we don't a<wait fiber
-    assert_in_range 4..6, i
+    assert_in_range 4..6, counter if IS_LINUX
   end
 
   class MyTimeoutException < Exception

data/test/test_global_api.rb

@@ -162,7 +162,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
     assert_equal 1, o
-    assert_in_range 0.008..0.015, t1 - t0
+    assert_in_range 0.008..0.015, t1 - t0 if IS_LINUX
 
     t0 = Time.now
     o = move_on_after(0.05, with_value: 1) do
@@ -172,7 +172,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
     assert_equal 2, o
-    assert_in_range 0.008..0.013, t1 - t0
+    assert_in_range 0.008..0.013, t1 - t0 if IS_LINUX
   end
 end
 
@@ -297,7 +297,7 @@ class SpinLoopTest < MiniTest::Test
     f = spin_loop(rate: 100) { buffer << (counter += 1) }
     sleep 0.02
     f.stop
-    assert_in_range 1..3, counter
+    assert_in_range 1..3, counter if IS_LINUX
   end
 
   def test_spin_loop_with_interval
@@ -307,7 +307,7 @@ class SpinLoopTest < MiniTest::Test
     f = spin_loop(interval: 0.01) { buffer << (counter += 1) }
     sleep 0.02
     f.stop
-    assert_in_range 1..3, counter
+    assert_in_range 1..3, counter if IS_LINUX
   end
 
   def test_spin_loop_break
@@ -386,10 +386,10 @@ class ThrottledLoopTest < MiniTest::Test
     counter = 0
     t0 = Time.now
     f = spin do
-      throttled_loop(100) { buffer << (counter += 1) }
+      throttled_loop(10) { buffer << (counter += 1) }
     end
-    sleep 0.03
-    assert_in_range 2..4, counter
+    sleep 0.3
+    assert_in_range 2..4, counter if IS_LINUX
   end
 
   def test_throttled_loop_with_count
@@ -412,13 +412,11 @@ class GlobalAPIEtcTest < MiniTest::Test
     f = after(0.001) { buffer << 2 }
     snooze
     assert_equal [], buffer
-    sleep 0.001
+    sleep 0.0015
     assert_equal [2], buffer
   end
 
   def test_every
-    skip unless IS_LINUX
-
     buffer = []
     t0 = Time.now
     f = spin do
@@ -426,14 +424,25 @@ class GlobalAPIEtcTest < MiniTest::Test
     end
     sleep 0.05
     f.stop
-    assert_in_range 4..6, buffer.size
+    assert_in_range 4..6, buffer.size if IS_LINUX
+  end
+
+  def test_every_with_slow_op
+    buffer = []
+    t0 = Time.now
+    f = spin do
+      every(0.01) { sleep 0.05; buffer << 1 }
+    end
+    sleep 0.15
+    f.stop
+    assert_in_range 2..3, buffer.size if IS_LINUX
   end
 
   def test_sleep
     t0 = Time.now
     sleep 0.1
     elapsed = Time.now - t0
-    assert (0.05..0.15).include? elapsed if IS_LINUX
+    assert_in_range 0.05..0.15, elapsed if IS_LINUX
 
     f = spin { sleep }
     snooze

data/test/test_io.rb

@@ -354,9 +354,9 @@ class IOClassMethodsTest < MiniTest::Test
     skip unless IS_LINUX
 
     counter = 0
-    timer = spin { throttled_loop(200) { counter += 1 } }
+    timer = spin { throttled_loop(20) { counter += 1 } }
 
-    IO.popen('sleep 0.05') { |io| io.read(8192) }
+    IO.popen('sleep 0.5') { |io| io.read(8192) }
     assert(counter >= 5)
 
     result = nil

data/test/test_kernel.rb

@@ -51,8 +51,8 @@ class KernelTest < MiniTest::Test
     counter = 0
     timer = spin { throttled_loop(200) { counter += 1 } }
 
-    `sleep 0.01`
-    assert(counter >= 2)
+    `sleep 0.05`
+    assert_in_range 8..14, counter if IS_LINUX
 
     result = `echo "hello"`
     assert_equal "hello\n", result

data/test/test_process_supervision.rb

@@ -65,7 +65,7 @@ class ProcessSupervisionTest < MiniTest::Test
 
     supervisor = spin { supervise(watcher) }
 
-    sleep 0.05
+    sleep 0.1
     supervisor.terminate
     supervisor.await
 

data/test/test_signal.rb

@@ -93,4 +93,23 @@ class SignalTrapTest < Minitest::Test
     buffer = i.read
     assert_equal "INT\n", buffer
   end
-end
+
+  def test_busy_signal_handling
+    i, o = IO.pipe
+    pid = Polyphony.fork do
+      main = Fiber.current
+      trap('INT') { o.puts 'INT'; o.close; main.stop }
+      i.close
+      f1 = spin_loop { snooze }
+      f2 = spin_loop { snooze }
+      f1.await
+    end
+
+    o.close
+    sleep 0.1
+    Process.kill('INT', pid)
+    Thread.current.backend.waitpid(pid)
+    buffer = i.read
+    assert_equal "INT\n", buffer
+  end
+end

data/test/test_socket.rb

@@ -9,9 +9,9 @@ class SocketTest < MiniTest::Test
     super
   end
 
-  def start_tcp_server_on_random_port
+  def start_tcp_server_on_random_port(host = '127.0.0.1')
     port = rand(1100..60000)
-    server = TCPServer.new('127.0.0.1', port)
+    server = TCPServer.new(host, port)
     [port, server]
   rescue Errno::EADDRINUSE
     retry
@@ -40,6 +40,39 @@ class SocketTest < MiniTest::Test
     server&.close
   end
 
+  def test_tcpsocket_open_with_hostname
+    client = TCPSocket.open('google.com', 80)
+    client.write("GET / HTTP/1.0\r\nHost: google.com\r\n\r\n")
+    result = nil
+    move_on_after(1) {
+      result = client.read
+    }
+    assert result =~ /HTTP\/1.0 301 Moved Permanently/
+  end
+
+  def test_tcp_ipv6
+    port, server = start_tcp_server_on_random_port('::1')
+    server_fiber = spin do
+      while (socket = server.accept)
+        spin do
+          while (data = socket.gets(8192))
+            socket << data
+          end
+        end
+      end
+    end
+
+    snooze
+    client = TCPSocket.new('::1', port)
+    client.write("1234\n")
+    assert_equal "1234\n", client.recv(8192)
+    client.close
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    server&.close
+  end
+
   def test_read
     port, server = start_tcp_server_on_random_port
     server_fiber = spin do

data/test/test_thread.rb

@@ -132,7 +132,7 @@ class ThreadTest < MiniTest::Test
     Thread.backend.trace_proc = proc {|*r| records << r }
     suspend
     assert_equal [
-      [:fiber_switchpoint, Fiber.current]
+      [:fiber_switchpoint, Fiber.current, ["#{__FILE__}:#{__LINE__ - 2}:in `test_that_suspend_returns_immediately_if_no_watchers'"] + caller]
     ], records
   ensure
     Thread.backend.trace_proc = nil

data/test/test_thread_pool.rb

@@ -65,7 +65,7 @@ class ThreadPoolTest < MiniTest::Test
     end
     elapsed = Time.now - t0
 
-    assert_in_range 0.0..0.009, elapsed
+    assert_in_range 0.0..0.009, elapsed if IS_LINUX
     assert buffer.size < 2
 
     sleep 0.15 # allow time for threads to spawn

data/test/test_throttler.rb

@@ -10,7 +10,7 @@ class ThrottlerTest < MiniTest::Test
     f = spin { loop { t.process { buffer << 1 } } }
     sleep 0.2
     f.stop
-    assert_in_range 1..4, buffer.size
+    assert_in_range 1..4, buffer.size if IS_LINUX
   ensure
     t.stop
   end
@@ -23,7 +23,7 @@ class ThrottlerTest < MiniTest::Test
     end
     sleep 0.25
     f.stop
-    assert_in_range 2..7, buffer.size
+    assert_in_range 4..6, buffer.size if IS_LINUX
   ensure
     t.stop
   end
@@ -34,7 +34,7 @@ class ThrottlerTest < MiniTest::Test
     f = spin { loop { t.process { buffer << 1 } } }
     sleep 0.02
     f.stop
-    assert_in_range 2..4, buffer.size
+    assert_in_range 2..4, buffer.size if IS_LINUX
   ensure
     t.stop
   end

data/test/test_timer.rb

@@ -160,6 +160,6 @@ class TimerMiscTest < MiniTest::Test
     end
     sleep 0.05
     f.stop
-    assert_in_range 3..7, buffer.size
+    assert_in_range 3..7, buffer.size if IS_LINUX
   end
 end

data/test/test_trace.rb

@@ -10,7 +10,7 @@ class TraceTest < MiniTest::Test
 
     assert_equal [
       [:fiber_schedule, Fiber.current, nil, false],
-      [:fiber_switchpoint, Fiber.current],
+      [:fiber_switchpoint, Fiber.current, ["#{__FILE__}:#{__LINE__ - 4}:in `test_tracing_enabled'"] + caller],
       [:fiber_run, Fiber.current, nil]
     ], events
   ensure
@@ -22,9 +22,15 @@ class TraceTest < MiniTest::Test
     Thread.backend.trace_proc = proc { |*e| events << e }
 
     f = spin { sleep 0; :byebye }
+    l0 = __LINE__ + 1
     suspend
     sleep 0
 
+    Thread.backend.trace_proc = nil
+    
+    # remove caller info for :fiber_switchpoint events
+    events.each {|e| e.pop if e[0] == :fiber_switchpoint }
+
     assert_equal [
       [:fiber_create, f],
       [:fiber_schedule, f, nil, false],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.72'
+  version: '0.75'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -146,6 +146,7 @@ extra_rdoc_files:
 files:
 - ".github/FUNDING.yml"
 - ".github/workflows/test.yml"
+- ".github/workflows/test_io_uring.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rubocop.yml"
@@ -233,6 +234,7 @@ files:
 - examples/core/queue.rb
 - examples/core/recurrent-timer.rb
 - examples/core/resource_delegate.rb
+- examples/core/ring.rb
 - examples/core/spin.rb
 - examples/core/spin_error_backtrace.rb
 - examples/core/supervise-process.rb
@@ -354,6 +356,7 @@ files:
 - lib/polyphony/adapters/redis.rb
 - lib/polyphony/adapters/sequel.rb
 - lib/polyphony/core/channel.rb
+- lib/polyphony/core/debug.rb
 - lib/polyphony/core/exceptions.rb
 - lib/polyphony/core/global_api.rb
 - lib/polyphony/core/resource_pool.rb
@@ -362,13 +365,16 @@ files:
 - lib/polyphony/core/throttler.rb
 - lib/polyphony/core/timer.rb
 - lib/polyphony/debugger.rb
-- lib/polyphony/extensions/core.rb
-- lib/polyphony/extensions/debug.rb
+- lib/polyphony/extensions.rb
+- lib/polyphony/extensions/exception.rb
 - lib/polyphony/extensions/fiber.rb
 - lib/polyphony/extensions/io.rb
+- lib/polyphony/extensions/kernel.rb
 - lib/polyphony/extensions/openssl.rb
+- lib/polyphony/extensions/process.rb
 - lib/polyphony/extensions/socket.rb
 - lib/polyphony/extensions/thread.rb
+- lib/polyphony/extensions/timeout.rb
 - lib/polyphony/net.rb
 - lib/polyphony/version.rb
 - polyphony.gemspec
@@ -425,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby