polyphony 0.71 → 0.74

data/test/test_backend.rb

@@ -36,7 +36,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 5, false, 0) }
     @backend.write(o, 'Hello world')
     return_value = f.await
-    
+
     assert_equal 'Hello', buf
     assert_equal return_value, buf
   end
@@ -51,7 +51,7 @@ class BackendTest < MiniTest::Test
     snooze
     o.close
     return_value = f.await
-    
+
     assert_equal 'Hello', buf
     assert_equal return_value, buf
   end
@@ -66,7 +66,7 @@ class BackendTest < MiniTest::Test
     snooze
     o.close
     return_value = f.await
-    
+
     assert_equal 'Hello world', buf
     assert_equal return_value, buf
   end
@@ -77,7 +77,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 20, false, 0) }
     @backend.write(o, 'blah')
     return_value = f.await
-    
+
     assert_equal 'blah', buf
     assert_equal return_value, buf
 
@@ -85,7 +85,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 20, false, -1) }
     @backend.write(o, 'klmn')
     return_value = f.await
-    
+
     assert_equal 'abcdefghijklmn', buf
     assert_equal return_value, buf
 
@@ -93,7 +93,7 @@ class BackendTest < MiniTest::Test
     f = spin { @backend.read(i, buf, 20, false, 3) }
     @backend.write(o, 'DEF')
     return_value = f.await
-    
+
     assert_equal 'abcDEF', buf
     assert_equal return_value, buf
   end
@@ -109,12 +109,12 @@ class BackendTest < MiniTest::Test
 
     o << data
     o.close
-    
+
     buf = +''
 
     @backend.read(i, buf, 4096, false, -1)
     assert_equal 4096, buf.bytesize
-    
+
     @backend.read(i, buf, 1, false, -1)
     assert_equal 4097, buf.bytesize
 
@@ -129,7 +129,7 @@ class BackendTest < MiniTest::Test
       @backend.post_fork
       exit(42)
     end
-    
+
     result = @backend.waitpid(pid)
     assert_equal [pid, 42], result
   end
@@ -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
@@ -427,7 +425,7 @@ class BackendTest < MiniTest::Test
     counter = 0
 
     @backend.idle_proc = proc { counter += 1 }
-    
+
     3.times { snooze }
     assert_equal 0, counter
 
@@ -488,7 +486,7 @@ class BackendChainTest < MiniTest::Test
 
     snooze
     client = TCPSocket.new('127.0.0.1', port)
-    
+
     result = Thread.backend.chain(
       [:send, client, 'hello', 0],
       [:send, client, " world\n", 0]
@@ -512,7 +510,7 @@ class BackendChainTest < MiniTest::Test
     while true
       len = o.splice(from, 8192)
       break if len == 0
-      
+
       backend.chain(
         [:write, to, chunk_header(len)],
         [:splice, i, to, len]

data/test/test_event.rb

@@ -25,7 +25,7 @@ class EventTest < MiniTest::Test
   def test_that_event_coalesces_signals
     count = 0
     a = Polyphony::Event.new
-   
+
     coproc = spin {
       loop {
         a.await

data/test/test_ext.rb

@@ -73,7 +73,7 @@ class KernelTest < MiniTest::Test
     data = `>&2 echo "error"`
     $stderr.rewind
     $stderr = prev_stderr
-    
+
     assert_equal '', data
     assert_equal "error\n", err_io.read
   ensure

data/test/test_fiber.rb

@@ -47,7 +47,7 @@ class FiberTest < MiniTest::Test
     f1 = spin { :foo }
     f2 = spin { :bar }
     4.times { snooze }
-    
+
     assert_equal [:foo, :bar], Fiber.await(f1, f2)
   end
 
@@ -739,7 +739,7 @@ class FiberTest < MiniTest::Test
   def test_setup_raw
     buffer = []
     f = Fiber.new { buffer << receive }
-    
+
     assert_nil f.thread
     snooze
     f.setup_raw
@@ -771,10 +771,11 @@ class FiberTest < MiniTest::Test
 
     snooze
     assert_equal parent, child.parent
-    child.detach 
+    result = child.detach
+    assert_equal result, child
     assert_equal Fiber.current, child.parent
     parent.await
-    
+
     child << :bye
     child.await
 
@@ -807,7 +808,7 @@ class FiberTest < MiniTest::Test
     child.attach_to(new_parent)
     assert_equal new_parent, child.parent
     parent.await
-    
+
     child << :bye
     new_parent << :bye_new_parent
     snooze
@@ -820,6 +821,29 @@ class FiberTest < MiniTest::Test
       :bye_new_parent
     ], buf
   end
+
+  def test_attach_all_children_to
+    children = []
+    f1 = spin do
+      3.times {
+        children << spin { receive }
+      }
+      Fiber.current.parent << :ok
+      receive
+    end
+
+    result = receive
+    assert_equal :ok, result
+    assert_equal 3, children.size
+
+    f2 = spin { supervise }
+    f1.attach_all_children_to(f2)
+
+    snooze
+
+    assert_equal [], f1.children
+    assert_equal children, f2.children
+  end
 end
 
 class MailboxTest < MiniTest::Test
@@ -1126,7 +1150,7 @@ class RestartTest < MiniTest::Test
     assert_equal [1], buffer
     snooze
     assert_equal [1, 1], buffer
-    
+
     f << 'foo'
     sleep 0.1
     assert_equal [1, 1, 2], buffer
@@ -1252,7 +1276,7 @@ class DebugTest < MiniTest::Test
     assert_equal true, f.__parked__?
     10.times { snooze }
     assert_equal [], buf
-    
+
     f.__unpark__
     assert_nil f.__parked__?
     10.times { snooze }

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
 
@@ -280,7 +280,7 @@ class SpinLoopTest < MiniTest::Test
   def test_spin_loop_location
     location = /^#{__FILE__}:#{__LINE__ + 1}/
     f = spin_loop { snooze }
-    
+
     assert_match location, f.location
   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
@@ -402,7 +402,7 @@ class ThrottledLoopTest < MiniTest::Test
     f.await
     t1 = Time.now
     assert_in_range 0.075..0.15, t1 - t0 if IS_LINUX
-    assert_equal [1, 2, 3, 4, 5], buffer    
+    assert_equal [1, 2, 3, 4, 5], buffer
   end
 end
 
@@ -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

@@ -107,10 +107,10 @@ class IOTest < MiniTest::Test
       sleep 0.01
       o << 'hi'
     }
-    assert_equal 'hi', i.readpartial(2) 
+    assert_equal 'hi', i.readpartial(2)
     o.close
 
-    assert_raises(EOFError) { i.readpartial(1) }    
+    assert_raises(EOFError) { i.readpartial(1) }
   end
 
   def test_gets
@@ -132,7 +132,7 @@ class IOTest < MiniTest::Test
     f << Fiber.current
     sleep 0.05
     assert_equal [], buf
-    
+
     o << "ulous\n"
     receive
     assert_equal ["fabulous\n"], buf
@@ -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_queue.rb

@@ -70,7 +70,7 @@ class QueueTest < MiniTest::Test
 
   def test_empty?
     assert @queue.empty?
-    
+
     @queue << :foo
     assert !@queue.empty?
 
@@ -82,7 +82,7 @@ class QueueTest < MiniTest::Test
     f1 = spin { @queue.shift }
     f2 = spin { @queue.shift }
     f3 = spin { @queue.shift }
-    
+
     # let fibers run
     snooze
 
@@ -99,7 +99,7 @@ class QueueTest < MiniTest::Test
 
   def test_fiber_removal_from_queue_simple
     f1 = spin { @queue.shift }
-    
+
     # let fibers run
     snooze
 
@@ -114,11 +114,11 @@ class QueueTest < MiniTest::Test
     assert_equal 0, @queue.size
 
     @queue.push 1
-    
+
     assert_equal 1, @queue.size
 
     @queue.push 2
-    
+
     assert_equal 2, @queue.size
 
     @queue.shift
@@ -231,7 +231,7 @@ class CappedQueueTest < MiniTest::Test
     i = 0
     spin_loop do
       i += 1
-      snooze 
+      snooze
     end
 
     5.times { snooze }

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,16 @@ class SocketTest < MiniTest::Test
     super
   end
 
+  def start_tcp_server_on_random_port(host = '127.0.0.1')
+    port = rand(1100..60000)
+    server = TCPServer.new(host, port)
+    [port, server]
+  rescue Errno::EADDRINUSE
+    retry
+  end
+
   def test_tcp
-    port = rand(1234..5678)
-    server = TCPServer.new('127.0.0.1', port)
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       while (socket = server.accept)
         spin do
@@ -33,9 +40,41 @@ 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 = rand(1234..5678)
-    server = TCPServer.new('127.0.0.1', port)
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       while (socket = server.accept)
         spin do
@@ -74,9 +113,7 @@ class SocketTest < MiniTest::Test
 
   # sending multiple strings at once
   def test_sendv
-    port = rand(1234..5678)
-    server = TCPServer.new('127.0.0.1', port)
-
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       while (socket = server.accept)
         spin do
@@ -100,9 +137,7 @@ class SocketTest < MiniTest::Test
 
 
   def test_feed_loop
-    port = rand(1234..5678)
-    server = TCPServer.new('127.0.0.1', port)
-
+    port, server = start_tcp_server_on_random_port
     server_fiber = spin do
       reader = MessagePack::Unpacker.new
       while (socket = server.accept)

data/test/test_supervise.rb

@@ -135,6 +135,44 @@ class SuperviseTest < MiniTest::Test
     assert_equal supervisor, f3.parent
   end
 
+  def test_supervise_with_restart_true
+    buffer = []
+    f1 = spin(:f1) do
+      buffer << receive
+    rescue => e
+      buffer << e
+      e
+    end
+    supervisor = spin(:supervisor) { supervise(f1, restart: true) }
+
+    snooze
+    f1 << 'foo'
+    f1.await
+    snooze
+    assert_equal ['foo'], buffer
+
+    10.times { snooze }
+
+    assert_equal 1, supervisor.children.size
+    f2 = supervisor.children.first
+    assert f1 != f2
+    assert_equal :f1, f2.tag
+    assert_equal supervisor, f2.parent
+
+    e = RuntimeError.new('bar')
+    f2.raise(e)
+    f2.await rescue nil
+    3.times { snooze }
+    assert_equal ['foo', e], buffer
+
+    assert_equal 1, supervisor.children.size
+    f3 = supervisor.children.first
+    assert f2 != f3
+    assert f1 != f3
+    assert_equal :f1, f3.tag
+    assert_equal supervisor, f3.parent
+  end
+
   def test_supervise_with_restart_on_error
     buffer = []
     f1 = spin(:f1) do
@@ -184,4 +222,51 @@ class SuperviseTest < MiniTest::Test
 
     assert_equal [], buffer
   end
+
+  def test_supervise_without_explicit_fibers
+    buffer = []
+    first = nil
+    supervisor = spin do
+      3.times do |i|
+        f = spin do
+          first = Fiber.current if i == 0
+          receive
+          buffer << i
+        end
+      end
+      Fiber.current.parent << :ok
+      supervise(restart: :always)
+    end
+    msg = receive
+    assert_equal :ok, msg
+    assert_equal 3, supervisor.children.size
+
+    sleep 0.1
+    assert_equal [], buffer
+
+    old_first = first
+    first << :foo
+    first = nil
+    snooze
+    assert_equal [0], buffer
+
+    snooze
+    assert_equal 3, supervisor.children.size
+    snooze
+    assert first
+    assert first != old_first
+  end
+
+  def test_supervise_with_added_fibers
+    buffer = []
+    supervisor = spin do
+      supervise { |f, r| buffer << [f, r] }
+    end
+    snooze
+    f1 = supervisor.spin { snooze; :foo }
+    f2 = supervisor.spin { snooze; :bar }
+    Fiber.await(f1, f2)
+    snooze
+    assert_equal [[f1, :foo], [f2, :bar]], buffer
+  end
 end

data/test/test_sync.rb

@@ -104,12 +104,12 @@ class MutexTest < MiniTest::Test
     snooze
     assert !lock.locked?
     a << Fiber.current
-    
+
     receive
     assert lock.locked?
 
     a << Fiber.current
-    
+
     receive
     assert !lock.locked?
   end

data/test/test_thread.rb

@@ -180,7 +180,7 @@ class ThreadTest < MiniTest::Test
     assert_equal count, GC.count
     sleep 0.05
     assert_equal count, GC.count
-    
+
     return unless IS_LINUX
 
     # The idle tasks are ran at most once per fiber switch, before the backend
@@ -207,7 +207,7 @@ class ThreadTest < MiniTest::Test
     counter = 0
 
     Thread.current.on_idle { counter += 1 }
-    
+
     3.times { snooze }
     assert_equal 0, counter
 
@@ -220,4 +220,24 @@ class ThreadTest < MiniTest::Test
     3.times { snooze }
     assert_equal 2, counter
   end
+
+  def test_cross_thread_receive
+    buf = []
+    f = Fiber.current
+    t = Thread.new do
+      f << true
+      while (msg = receive)
+        buf << msg
+      end
+    end
+
+    receive # wait for thread to be ready
+    t << 1
+    t << 2
+    t << 3
+    t << nil
+
+    t.join
+    assert_equal [1, 2, 3], buf
+  end
 end