polyphony 0.54.0 → 0.59

data/lib/polyphony/extensions/fiber.rb

@@ -262,7 +262,7 @@ module Polyphony
       @parent = parent
       @caller = caller
       @block = block
-      __fiber_trace__(:fiber_create, self)
+      Thread.backend.trace(:fiber_create, self)
       schedule
     end
 
@@ -311,7 +311,7 @@ module Polyphony
 
     def finalize(result, uncaught_exception = false)
       result, uncaught_exception = finalize_children(result, uncaught_exception)
-      __fiber_trace__(:fiber_terminate, self, result)
+      Thread.backend.trace(:fiber_terminate, self, result)
       @result = result
       @running = false
       inform_dependants(result, uncaught_exception)

data/lib/polyphony/extensions/socket.rb

@@ -36,9 +36,9 @@ class ::Socket
   end
 
   def recvfrom(maxlen, flags = 0)
-    @read_buffer ||= +''
+    buf = +''
     while true
-      result = recvfrom_nonblock(maxlen, flags, @read_buffer, **NO_EXCEPTION)
+      result = recvfrom_nonblock(maxlen, flags, buf, **NO_EXCEPTION)
       case result
       when nil then raise IOError
       when :wait_readable then Polyphony.backend_wait_io(self, false)
@@ -165,17 +165,10 @@ class ::TCPSocket
   #   Polyphony.backend_send(self, mesg, 0)
   # end
 
-  def readpartial(maxlen, str = nil)
-    @read_buffer ||= +''
-    result = Polyphony.backend_recv(self, @read_buffer, maxlen)
+  def readpartial(maxlen, str = +'')
+    result = Polyphony.backend_recv(self, str, maxlen)
     raise EOFError unless result
 
-    if str
-      str << @read_buffer
-    else
-      str = @read_buffer
-    end
-    @read_buffer = +''
     str
   end
 
@@ -249,17 +242,10 @@ class ::UNIXSocket
     Polyphony.backend_send(self, mesg, 0)
   end
 
-  def readpartial(maxlen, str = nil)
-    @read_buffer ||= +''
-    result = Polyphony.backend_recv(self, @read_buffer, maxlen)
+  def readpartial(maxlen, str = +'')
+    result = Polyphony.backend_recv(self, str, maxlen)
     raise EOFError unless result
 
-    if str
-      str << @read_buffer
-    else
-      str = @read_buffer
-    end
-    @read_buffer = +''
     str
   end
 

data/lib/polyphony/extensions/thread.rb

@@ -105,4 +105,12 @@ class ::Thread
     main_fiber << value
   end
   alias_method :send, :<<
+
+  def idle_gc_period=(period)
+    backend.idle_gc_period = period
+  end
+
+  def on_idle(&block)
+    backend.idle_proc = block
+  end
 end

data/lib/polyphony/version.rb

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

data/test/helper.rb

@@ -15,9 +15,9 @@ require 'minitest/reporters'
 
 ::Exception.__disable_sanitized_backtrace__ = true
 
-Minitest::Reporters.use! [
-  Minitest::Reporters::SpecReporter.new
-]
+# Minitest::Reporters.use! [
+#   Minitest::Reporters::SpecReporter.new
+# ]
 
 class ::Fiber
   attr_writer :auto_watcher

data/test/test_backend.rb

@@ -26,7 +26,7 @@ class BackendTest < MiniTest::Test
       @backend.sleep 0.01
       count += 1
     }.await
-    assert_in_delta 0.03, Time.now - t0, 0.005
+    assert_in_delta 0.03, Time.now - t0, 0.01
     assert_equal 3, count
   end
 
@@ -281,6 +281,97 @@ class BackendTest < MiniTest::Test
       f.await
     end
   end
+
+
+  def test_splice_chunks
+    body = 'abcd' * 250
+    chunk_size = 750
+
+    buf = +''
+    r, w = IO.pipe
+    reader = spin do
+      r.read_loop { |data| buf << data }
+    end
+
+    i, o = IO.pipe
+    writer = spin do
+      o << body
+      o.close
+    end
+    Thread.current.backend.splice_chunks(
+      i,
+      w,
+      "Content-Type: foo\r\n\r\n",
+      "0\r\n\r\n",
+      ->(len) { "#{len.to_s(16)}\r\n" },
+      "\r\n",
+      chunk_size
+    )
+    w.close
+    reader.await
+
+    expected = "Content-Type: foo\r\n\r\n#{750.to_s(16)}\r\n#{body[0..749]}\r\n#{250.to_s(16)}\r\n#{body[750..999]}\r\n0\r\n\r\n"
+    assert_equal expected, buf
+  ensure
+    o.close
+    w.close
+  end
+
+  def test_idle_gc
+    GC.disable
+
+    count = GC.count
+    snooze
+    assert_equal count, GC.count
+    sleep 0.01
+    assert_equal count, GC.count
+
+    @backend.idle_gc_period = 0.1
+    snooze
+    assert_equal count, GC.count
+    sleep 0.05
+    assert_equal count, GC.count
+    # The idle tasks are ran at most once per fiber switch, before the backend
+    # is polled. Therefore, the second sleep will not have triggered a GC, since
+    # only 0.05s have passed since the gc period was set.
+    sleep 0.07
+    assert_equal count, GC.count
+    # Upon the third sleep the GC should be triggered, at 0.12s post setting the
+    # GC period.
+    sleep 0.05
+    assert_equal count + 1, GC.count
+
+    @backend.idle_gc_period = 0
+    count = GC.count
+    sleep 0.001
+    sleep 0.002
+    sleep 0.003
+    assert_equal count, GC.count
+  ensure
+    GC.enable
+  end
+
+  def test_idle_proc
+    counter = 0
+
+    @backend.idle_proc = proc { counter += 1 }
+    
+    3.times { snooze }
+    assert_equal 0, counter
+
+    sleep 0.01
+    assert_equal 1, counter
+    sleep 0.01
+    assert_equal 2, counter
+
+    assert_equal 2, counter
+    3.times { snooze }
+    assert_equal 2, counter
+
+    @backend.idle_proc = nil
+    sleep 0.01
+    assert_equal 2, counter
+  end
 end
 
 class BackendChainTest < MiniTest::Test
@@ -309,6 +400,36 @@ class BackendChainTest < MiniTest::Test
     assert_equal 'hello world', i.read
   end
 
+  def test_simple_send_chain
+    port = rand(1234..5678)
+    server = TCPServer.new('127.0.0.1', port)
+
+    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('127.0.0.1', port)
+    
+    result = Thread.backend.chain(
+      [:send, client, 'hello', 0],
+      [:send, client, " world\n", 0]
+    )
+    sleep 0.1
+    assert_equal "hello world\n", client.recv(8192)
+    client.close
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    server&.close
+  end
+
   def chunk_header(len)
     "Content-Length: #{len}\r\n\r\n"
   end
@@ -346,7 +467,16 @@ class BackendChainTest < MiniTest::Test
 
     assert_raises(RuntimeError) {
       Thread.backend.chain(
-        [:read, o]
+        [:read, i]
+      )
+    }
+
+    assert_raises(RuntimeError) {
+      Thread.backend.chain(
+        [:write, o, 'abc'],
+        [:write, o, 'abc'],
+        [:write, o, 'abc'],
+        [:read, i]
       )
     }
 
@@ -355,5 +485,10 @@ class BackendChainTest < MiniTest::Test
         [:write, o]
       )
     }
+
+    # Eventually we should add some APIs to the io_uring backend to query the
+    # contxt store, then add some tests here to verify that the chain op ctx is
+    # released properly before raising the error (for the time being this has
+    # been verified manually).
   end
 end

data/test/test_fiber.rb

@@ -132,7 +132,6 @@ class FiberTest < MiniTest::Test
     event = Polyphony::Event.new
 
     t = Thread.new do
-      f = spin_loop { snooze }
       sleep 0.001
       event.signal(:foo)
     end

data/test/test_io.rb

@@ -98,8 +98,10 @@ class IOTest < MiniTest::Test
 
     buf = []
     f = spin do
+      peer = receive
       while (l = i.gets)
         buf << l
+        peer << true
       end
     end
 
@@ -107,11 +109,12 @@ class IOTest < MiniTest::Test
     assert_equal [], buf
 
     o << 'fab'
-    snooze
+    f << Fiber.current
+    sleep 0.05
     assert_equal [], buf
     
     o << "ulous\n"
-    sleep 0.01
+    receive
     assert_equal ["fabulous\n"], buf
 
     o.close
@@ -287,7 +290,7 @@ class IOClassMethodsTest < MiniTest::Test
   end
 
   def test_foreach
-    skip "IO.foreach is not yet implemented"
+    skip 'IO.foreach is not yet implemented'
     lines = []
     IO.foreach(__FILE__) { |l| lines << l }
     assert_equal "# frozen_string_literal: true\n", lines[0]

data/test/test_signal.rb

@@ -50,7 +50,7 @@ class SignalTrapTest < Minitest::Test
     ensure
       o.close
     end
-    sleep 0.02
+    sleep 0.1
     o.close
     Process.kill('INT', pid)
     Thread.current.backend.waitpid(pid)

data/test/test_thread.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
-require 'polyphony/adapters/trace'
 
 class ThreadTest < MiniTest::Test
   def test_thread_spin
@@ -130,18 +129,13 @@ class ThreadTest < MiniTest::Test
 
   def test_that_suspend_returns_immediately_if_no_watchers
     records = []
-    t = Polyphony::Trace.new(:fiber_all) do |r|
-      records << r if r[:event] =~ /^fiber_/
-    end
-    t.enable
-    Polyphony.trace(true)
-
+    Thread.backend.trace_proc = proc {|*r| records << r }
     suspend
-    t.disable
-    assert_equal [:fiber_switchpoint], records.map { |r| r[:event] }
+    assert_equal [
+      [:fiber_switchpoint, Fiber.current]
+    ], records
   ensure
-    t&.disable
-    Polyphony.trace(false)
+    Thread.backend.trace_proc = nil
   end
 
   def test_thread_child_fiber_termination
@@ -171,4 +165,56 @@ class ThreadTest < MiniTest::Test
     t&.kill
     t&.join
   end
+
+  def test_idle_gc
+    GC.disable
+
+    count = GC.count
+    snooze
+    assert_equal count, GC.count
+    sleep 0.01
+    assert_equal count, GC.count
+
+    Thread.current.idle_gc_period = 0.1
+    snooze
+    assert_equal count, GC.count
+    sleep 0.05
+    assert_equal count, GC.count
+    # The idle tasks are ran at most once per fiber switch, before the backend
+    # is polled. Therefore, the second sleep will not have triggered a GC, since
+    # only 0.05s have passed since the gc period was set.
+    sleep 0.07
+    assert_equal count, GC.count
+    # Upon the third sleep the GC should be triggered, at 0.12s post setting the
+    # GC period.
+    sleep 0.05
+    assert_equal count + 1, GC.count
+
+    Thread.current.idle_gc_period = 0
+    count = GC.count
+    sleep 0.001
+    sleep 0.002
+    sleep 0.003
+    assert_equal count, GC.count
+  ensure
+    GC.enable
+  end
+
+  def test_on_idle
+    counter = 0
+
+    Thread.current.on_idle { counter += 1 }
+    
+    3.times { snooze }
+    assert_equal 0, counter
+
+    sleep 0.01
+    assert_equal 1, counter
+    sleep 0.01
+    assert_equal 2, counter
+
+    assert_equal 2, counter
+    3.times { snooze }
+    assert_equal 2, counter
+  end
 end

data/test/test_thread_pool.rb

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

data/test/test_timer.rb

@@ -31,7 +31,7 @@ class TimerMoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert_in_range 0.01..0.025, t1 - t0
+    assert_in_range 0.01..0.05, t1 - t0
     assert_equal :bar, v
   end
 
@@ -48,7 +48,7 @@ class TimerMoveOnAfterTest < MiniTest::Test
     t1 = Time.now
 
     assert_nil v
-    assert_in_range 0.015..0.03, t1 - t0
+    assert_in_range 0.015..0.04, t1 - t0
   end
 end
 
@@ -75,14 +75,21 @@ class TimerCancelAfterTest < MiniTest::Test
   end
 
   def test_timer_cancel_after_with_reset
-    t0 = Time.now
-    @timer.cancel_after(0.01) do
-      sleep 0.007
+    buf = []
+    @timer.cancel_after(0.13) do
+      sleep 0.05
+      buf << 1
       @timer.reset
-      sleep 0.007
+      sleep 0.05
+      buf << 2
+      @timer.reset
+      sleep 0.05
+      buf << 3
+      @timer.reset
+      sleep 0.05
+      buf << 4
     end
-    t1 = Time.now
-    assert_in_range 0.012..0.024, t1 - t0
+    assert_equal [1, 2, 3, 4], buf
   end
 
   class CustomException < Exception
@@ -140,7 +147,6 @@ class TimerMiscTest < MiniTest::Test
     snooze
     assert_equal [], buffer
     sleep 0.1
-    p :post_sleep
     assert_equal [2], buffer
   end
 
@@ -152,6 +158,6 @@ class TimerMiscTest < MiniTest::Test
     end
     sleep 0.05
     f.stop
-    assert_in_range 4..6, buffer.size
+    assert_in_range 3..7, buffer.size
   end
 end