polyphony 0.75 → 0.79

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 = [
+      [:block, :main],
+      [:enter_poll, :main],
+      [:spin, :oob],
+      [:schedule, :oob],
+      [:leave_poll, :main],
+      [:unblock, :oob],
+      [:terminate, :oob],
+      [:block, :oob],
+      [:enter_poll, :oob],
+      [:schedule, :main],
+      [:leave_poll, :oob],
+      [:unblock, :main]
+    ]
+    if Thread.backend.kind == :libev
+      expected += [
+        [:schedule, :main],
+        [:block, :main],
+        [:unblock, :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_supervise.rb

@@ -269,4 +269,31 @@ class SuperviseTest < MiniTest::Test
     snooze
     assert_equal [[f1, :foo], [f2, :bar]], buffer
   end
+
+  def test_detached_supervisor
+    buffer = []
+
+    s = nil
+    f = spin {
+      foo = spin do
+        sleep 0.1
+      ensure
+        buffer << :foo
+      end
+      bar = spin do
+        sleep 0.2
+      ensure
+        buffer << :bar
+      end
+
+      s = spin { supervise }.detach
+      Fiber.current.attach_all_children_to(s)
+
+      s.terminate(true)
+    }
+
+    f.await
+    s.await
+    assert_equal [:foo, :bar], buffer
+  end
 end

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, ["#{__FILE__}:#{__LINE__ - 2}:in `test_that_suspend_returns_immediately_if_no_watchers'"] + caller]
+      [:block, 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_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

data/test/test_trace.rb

@@ -1,17 +1,29 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
+require 'polyphony/core/debug'
 
 class TraceTest < MiniTest::Test
   def test_tracing_enabled
     events = []
-    Thread.backend.trace_proc = proc { |*e| events << e }
+
+    Thread.backend.trace_proc = proc { |*e|
+      case e[0]
+      when :schedule
+        e = e[0..3]
+      when :block
+        e = e[0..1]
+      when :unblock
+        e = e[0..2]
+      end
+      events << e
+    }
     snooze
 
     assert_equal [
-      [:fiber_schedule, Fiber.current, nil, false],
-      [:fiber_switchpoint, Fiber.current, ["#{__FILE__}:#{__LINE__ - 4}:in `test_tracing_enabled'"] + caller],
-      [:fiber_run, Fiber.current, nil]
+      [:schedule, Fiber.current, nil, false],
+      [:block, Fiber.current],
+      [:unblock, Fiber.current, nil]
     ], events
   ensure
     Thread.backend.trace_proc = nil
@@ -19,7 +31,17 @@ class TraceTest < MiniTest::Test
 
   def test_2_fiber_trace
     events = []
-    Thread.backend.trace_proc = proc { |*e| events << e }
+    Thread.backend.trace_proc = proc { |*e|
+      case e[0]
+      when :schedule
+        e = e[0..3]
+      when :spin, :block
+        e = e[0..1]
+      when :unblock
+        e = e[0..2]
+      end
+      events << e
+    }
 
     f = spin { sleep 0; :byebye }
     l0 = __LINE__ + 1
@@ -28,28 +50,84 @@ class TraceTest < MiniTest::Test
 
     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],
-      [:fiber_switchpoint, Fiber.current],
-      [:fiber_run, f, nil],
-      [:fiber_switchpoint, f],
-      [:fiber_event_poll_enter, f],
-      [:fiber_schedule, f, nil, false],
-      [:fiber_event_poll_leave, f],
-      [:fiber_run, f, nil],
-      [:fiber_terminate, f, :byebye],
-      [:fiber_switchpoint, f],
-      [:fiber_switchpoint, Fiber.current],
-      [:fiber_event_poll_enter, Fiber.current],
-      [:fiber_schedule, Fiber.current, nil, false],
-      [:fiber_event_poll_leave, Fiber.current],
-      [:fiber_run, Fiber.current, nil]
+      [:spin, f],
+      [:schedule, f, nil, false],
+      [:block, Fiber.current],
+      [:unblock, f, nil],
+      [:block, f],
+      [:enter_poll, f],
+      [:schedule, f, nil, false],
+      [:leave_poll, f],
+      [:unblock, f, nil],
+      [:terminate, f, :byebye],
+      [:block, f],
+      [:block, Fiber.current],
+      [:enter_poll, Fiber.current],
+      [:schedule, Fiber.current, nil, false],
+      [:leave_poll, Fiber.current],
+      [:unblock, Fiber.current, nil]
     ], events
   ensure
     Thread.backend.trace_proc = nil
   end
+
+  def test_event_firehose
+    buffer = []
+    Polyphony::Trace.start_event_firehose { |e| buffer << e }
+
+    f1 = spin(:f1) do
+      receive
+    end
+
+    f1 << :foo
+    f1.await
+
+    Thread.backend.trace_proc = nil
+
+    buffer.each { |e| e.delete(:stamp); e.delete(:caller) }
+
+    main = Fiber.current
+    assert_equal(
+      [
+        { event: :spin,       fiber: f1,                  source_fiber: main  },
+        { event: :schedule,   fiber: f1,    value: nil,   source_fiber: main  },
+        { event: :block,      fiber: main                                     },
+        { event: :unblock,    fiber: f1,    value: nil                        },
+        { event: :schedule,   fiber: f1,    value: nil,   source_fiber: f1    },
+        { event: :block,      fiber: f1,                                      },
+        { event: :enter_poll                                                  },
+        { event: :leave_poll                                                  },
+        { event: :unblock,    fiber: f1,    value: nil                        },
+        { event: :terminate,  fiber: f1,    value: :foo                       },
+        { event: :schedule,   fiber: main,  value: nil,   source_fiber: f1    },
+        { event: :block,      fiber: f1                                       },
+        { event: :unblock,    fiber: main,  value: nil                        }
+      ], buffer
+    )
+  ensure
+    Thread.backend.trace_proc = nil
+  end
+
+  def test_event_firehose_with_io
+    r, w = IO.pipe
+    Polyphony::Trace.start_event_firehose(w)
+
+    f1 = spin(:f1) do
+      receive
+    end
+
+    f1 << :foo
+    f1.await
+
+    Thread.backend.trace_proc = nil
+    w.close
+
+    log = r.read
+    assert_equal 13, log.lines.size
+
+    # TODO: make sure log is formatted correctly
+  ensure
+    Thread.backend.trace_proc = nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.75'
+  version: '0.79'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-19 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:
@@ -245,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
@@ -346,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
@@ -412,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
@@ -431,8 +434,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Fine grained concurrency for Ruby
 test_files: []