polyphony 0.73.1 → 0.77

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_fiber.rb

@@ -923,18 +923,20 @@ class MailboxTest < MiniTest::Test
   def test_cross_thread_send_receive
     ping_receive_buffer = []
     pong_receive_buffer = []
+    master = Fiber.current
 
     pong = Thread.new do
-      sleep 0.05
-      loop do
+      master << :pong_ready
+      3.times do
         peer, data = receive
         pong_receive_buffer << data
         peer << 'pong'
       end
     end
 
+    assert_equal :pong_ready, receive
+
     ping = Thread.new do
-      sleep 0.05
       3.times do
         pong << [Fiber.current, 'ping']
         data = receive
@@ -943,7 +945,7 @@ class MailboxTest < MiniTest::Test
     end
 
     ping.join
-    pong.kill
+    pong.join
     ping = pong = nil
 
     assert_equal %w{pong pong pong}, ping_receive_buffer

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
@@ -417,8 +417,6 @@ class GlobalAPIEtcTest < MiniTest::Test
   end
 
   def test_every
-    skip unless IS_LINUX
-
     buffer = []
     t0 = Time.now
     f = spin do
@@ -426,12 +424,10 @@ 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
-    skip unless IS_LINUX
-
     buffer = []
     t0 = Time.now
     f = spin do
@@ -439,14 +435,14 @@ class GlobalAPIEtcTest < MiniTest::Test
     end
     sleep 0.15
     f.stop
-    assert_in_range 2..3, buffer.size
+    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_signal.rb

@@ -3,6 +3,63 @@
 require_relative 'helper'
 
 class SignalTrapTest < Minitest::Test
+  def test_signal_handler_trace
+    i1, o1 = IO.pipe
+    i2, o2 = IO.pipe
+    pid = Process.pid
+    child_pid = Polyphony.fork do
+      i1.gets
+      Process.kill('SIGINT', pid)
+      sleep 0.1
+      o2.puts "done"
+      o2.close
+    end
+
+    events = []
+    begin
+      Thread.backend.trace_proc = proc { |*e| events << [e[0], e[1].tag] }
+      trap ('SIGINT') { }
+      
+      o1.orig_write("\n")
+      o1.close
+
+      msg = i2.gets
+      assert_equal "done\n", msg
+    ensure
+      Thread.backend.trace_proc = nil
+      trap ('SIGINT') { raise Interrupt }
+    end
+
+    Fiber.current.tag = :main
+
+    expected = [
+      [:fiber_switchpoint, :main],
+      [:fiber_event_poll_enter, :main],
+      [:fiber_create, :oob],
+      [:fiber_schedule, :oob],
+      [:fiber_event_poll_leave, :main],
+      [:fiber_run, :oob],
+      [:fiber_terminate, :oob],
+      [:fiber_switchpoint, :oob],
+      [:fiber_event_poll_enter, :oob],
+      [:fiber_schedule, :main],
+      [:fiber_event_poll_leave, :oob],
+      [:fiber_run, :main]
+    ]
+    if Thread.backend.kind == :libev
+      expected += [
+        [:fiber_schedule, :main],
+        [:fiber_switchpoint, :main],
+        [:fiber_run, :main]
+      ]
+    end
+
+    assert_equal expected, events
+  ensure
+    Process.kill('SIGTERM', child_pid) rescue nil
+    Process.wait(child_pid) rescue nil
+  end
+
   def test_int_signal
     Thread.new { sleep 0.001; Process.kill('INT', Process.pid) }
     assert_raises(Interrupt) { sleep 5 }

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

@@ -78,7 +78,7 @@ class TimerCancelAfterTest < MiniTest::Test
 
   def test_timer_cancel_after_with_reset
     buf = []
-    @timer.cancel_after(0.13) do
+    @timer.cancel_after(0.15) do
       sleep 0.05
       buf << 1
       @timer.reset
@@ -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.73.1
+  version: '0.77'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
-description: 
+description:
 email: sharon@noteflakes.com
 executables: []
 extensions:
@@ -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"
@@ -244,6 +245,8 @@ files:
 - examples/core/thread_pool.rb
 - examples/core/throttling.rb
 - examples/core/timeout.rb
+- examples/core/trap1.rb
+- examples/core/trap2.rb
 - examples/core/using-a-mutex.rb
 - examples/core/worker-thread.rb
 - examples/io/backticks.rb
@@ -345,6 +348,7 @@ files:
 - ext/polyphony/runqueue_ring_buffer.h
 - ext/polyphony/socket_extensions.c
 - ext/polyphony/thread.c
+- ext/test_eintr.c
 - lib/polyphony.rb
 - lib/polyphony/adapters/fs.rb
 - lib/polyphony/adapters/irb.rb
@@ -411,7 +415,7 @@ metadata:
   documentation_uri: https://digital-fabric.github.io/polyphony/
   homepage_uri: https://digital-fabric.github.io/polyphony/
   changelog_uri: https://github.com/digital-fabric/polyphony/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - polyphony
@@ -430,8 +434,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Fine grained concurrency for Ruby
 test_files: []