polyphony 0.58 → 0.61

data/test/test_global_api.rb

@@ -372,7 +372,7 @@ class SpinScopeTest < MiniTest::Test
     rescue => e
       buffer << e.message
     end
-    6.times { snooze }
+    10.times { snooze }
     assert_equal 0, Fiber.current.children.size
     assert_equal ['foobar'], buffer
   end

data/test/test_io.rb

@@ -416,4 +416,33 @@ class IOClassMethodsTest < MiniTest::Test
     assert_equal "foo\nbar\n", pipe_read { |f| f.puts 'foo', 'bar' }
     assert_equal "foo\nbar\n", pipe_read { |f| f.puts 'foo', "bar\n" }
   end
+
+  def test_read_loop
+    i, o = IO.pipe
+
+    buf = []
+    f = spin do
+      buf << :ready
+      i.read_loop { |d| buf << d }
+      buf << :done
+    end
+
+    # writing always causes snoozing
+    o << 'foo'
+    o << 'bar'
+    o.close
+
+    f.await
+    assert_equal [:ready, 'foo', 'bar', :done], buf
+  end
+
+  def test_read_loop_with_max_len
+    r, w = IO.pipe
+
+    w << 'foobar'
+    w.close
+    buf = []
+    r.read_loop(3) { |data| buf << data }
+    assert_equal ['foo', 'bar'], buf
+  end
 end

data/test/test_supervise.rb

@@ -2,103 +2,103 @@
 
 require_relative 'helper'
 
-class SuperviseTest < MiniTest::Test
-  def test_supervise
-    p = spin { supervise }
-    snooze
-    f1 = p.spin { receive }
-    f2 = p.spin { receive }
-
-    snooze
-    assert_equal p.state, :waiting
-    f1 << 'foo'
-    f1.await
-    snooze
-
-    assert_equal :waiting, p.state
-    assert_equal :waiting, f2.state
-
-    f2 << 'bar'
-    f2.await
-    assert_equal :runnable, p.state
-    snooze
-
-    assert_equal :dead, p.state
-  end
-
-  def test_supervise_with_restart
-    watcher = spin { receive }
-    parent = spin { supervise(restart: true, watcher: watcher) }
-    snooze
-
-    buffer = []
-    f1 = parent.spin do
-      buffer << 'f1'
-    end
-
-    f1.await
-    assert_equal ['f1'], buffer
-    watcher.await
-    assert_equal ['f1', 'f1'], buffer
-  end
-
-  def test_supervise_with_restart_on_error
-    parent = spin { supervise(restart: true) }
-    snooze
-
-    buffer = []
-    f1 = parent.spin do
-      buffer << 'f1'
-      buffer << receive
-    end
-
-    snooze
-    assert_equal ['f1'], buffer
-
-    f1.raise 'foo'
-
-    3.times { snooze }
-
-    assert_equal ['f1', 'f1'], buffer
-    assert_equal :dead, f1.state
-
-    # f1 should have been restarted by supervisor
-    f1 = parent.children.first
-    assert_kind_of Fiber, f1
-
-    f1 << 'foo'
-    f1.await
-
-    assert_equal ['f1', 'f1', 'foo'], buffer
-  end
-
-  def test_supervisor_termination
-    f = nil
-    p = spin do
-      f = spin { sleep 1 }
-      supervise
-    end
-    sleep 0.01
-
-    p.terminate
-    p.await
-
-    assert :dead, f.state
-    assert :dead, p.state
-  end
-
-  def test_supervisor_termination_with_restart
-    f = nil
-    p = spin do
-      f = spin { sleep 1 }
-      supervise(restart: true)
-    end
-    sleep 0.01
-
-    p.terminate
-    p.await
-
-    assert :dead, f.state
-    assert :dead, p.state
-  end
-end
+# class SuperviseTest < MiniTest::Test
+#   def test_supervise
+#     p = spin { supervise }
+#     snooze
+#     f1 = p.spin { receive }
+#     f2 = p.spin { receive }
+
+#     snooze
+#     assert_equal p.state, :waiting
+#     f1 << 'foo'
+#     f1.await
+#     snooze
+
+#     assert_equal :waiting, p.state
+#     assert_equal :waiting, f2.state
+
+#     f2 << 'bar'
+#     f2.await
+#     assert_equal :runnable, p.state
+    
+#     3.times { snooze }
+#     assert_equal :dead, p.state
+#   end
+
+#   def test_supervise_with_restart
+#     watcher = spin { receive }
+#     parent = spin { supervise(restart: true, watcher: watcher) }
+#     snooze
+
+#     buffer = []
+#     f1 = parent.spin do
+#       buffer << 'f1'
+#     end
+
+#     f1.await
+#     assert_equal ['f1'], buffer
+#     watcher.await
+#     assert_equal ['f1', 'f1'], buffer
+#   end
+
+#   def test_supervise_with_restart_on_error
+#     parent = spin { supervise(restart: true) }
+#     snooze
+
+#     buffer = []
+#     f1 = parent.spin do
+#       buffer << 'f1'
+#       buffer << receive
+#     end
+
+#     snooze
+#     assert_equal ['f1'], buffer
+
+#     f1.raise 'foo'
+
+#     3.times { snooze }
+
+#     assert_equal ['f1', 'f1'], buffer
+#     assert_equal :dead, f1.state
+
+#     # f1 should have been restarted by supervisor
+#     f1 = parent.children.first
+#     assert_kind_of Fiber, f1
+
+#     f1 << 'foo'
+#     f1.await
+
+#     assert_equal ['f1', 'f1', 'foo'], buffer
+#   end
+
+#   def test_supervisor_termination
+#     f = nil
+#     p = spin do
+#       f = spin { sleep 1 }
+#       supervise
+#     end
+#     sleep 0.01
+
+#     p.terminate
+#     p.await
+
+#     assert :dead, f.state
+#     assert :dead, p.state
+#   end
+
+#   def test_supervisor_termination_with_restart
+#     f = nil
+#     p = spin do
+#       f = spin { sleep 1 }
+#       supervise(restart: true)
+#     end
+#     sleep 0.01
+
+#     p.terminate
+#     p.await
+
+#     assert :dead, f.state
+#     assert :dead, p.state
+#   end
+# end

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

data/test/test_thread_pool.rb

@@ -68,7 +68,7 @@ class ThreadPoolTest < MiniTest::Test
     assert_in_range 0.0..0.009, elapsed
     assert buffer.size < 2
     
-    sleep 0.1 # allow time for threads to spawn
+    sleep 0.15 # allow time for threads to spawn
     assert_equal @pool.size, threads.uniq.size
     assert_equal (0..9).to_a, buffer.sort
   end

data/test/test_trace.rb

@@ -1,70 +1,49 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
-require 'polyphony/adapters/trace'
 
 class TraceTest < MiniTest::Test
-  def test_tracing_disabled
-    records = []
-    t = Polyphony::Trace.new { |r| records << r if r[:event] =~ /^fiber_/ }
-    t.enable
-    snooze
-    assert_equal 0, records.size
-  ensure
-    t&.disable
-    Polyphony.trace(nil)
-  end
-
   def test_tracing_enabled
-    records = []
-    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if r[:event] =~ /^fiber_/ }
-    Polyphony.trace(true)
-    t.enable
+    events = []
+    Thread.backend.trace_proc = proc { |*e| events << e }
     snooze
-    t.disable
     
-    assert_equal 3, records.size
-    events = records.map { |r| r[:event] }
-    assert_equal [:fiber_schedule, :fiber_switchpoint, :fiber_run], events
-    assert_equal [Fiber.current], records.map { |r| r[:fiber] }.uniq
+    assert_equal [
+      [:fiber_schedule, Fiber.current, nil, false],
+      [:fiber_switchpoint, Fiber.current],
+      [:fiber_run, Fiber.current, nil]
+    ], events
   ensure
-    t&.disable
-    Polyphony.trace(nil)
+    Thread.backend.trace_proc = nil
   end
 
   def test_2_fiber_trace
-    records = []
-    thread = Thread.current
-    t = Polyphony::Trace.new(:fiber_all) do |r|
-      records << r if Thread.current == thread && r[:event] =~ /^fiber_/
-    end
-    t.enable
-    Polyphony.trace(true)
+    events = []
+    Thread.backend.trace_proc = proc { |*e| events << e }
 
-    f = spin { sleep 0 }
+    f = spin { sleep 0; :byebye }
     suspend
     sleep 0
 
-    events = records.map { |r| [r[:fiber] == f ? :f : :current, r[:event]] }
     assert_equal [
-      [:f, :fiber_create],
-      [:f, :fiber_schedule],
-      [:current, :fiber_switchpoint],
-      [:f, :fiber_run],
-      [:f, :fiber_switchpoint],
-      [:f, :fiber_event_poll_enter],
-      [:f, :fiber_schedule],
-      [:f, :fiber_event_poll_leave],
-      [:f, :fiber_run],
-      [:f, :fiber_terminate],
-      [:current, :fiber_switchpoint],
-      [:current, :fiber_event_poll_enter],
-      [:current, :fiber_schedule],
-      [:current, :fiber_event_poll_leave],
-      [:current, :fiber_run]
+      [: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]
     ], events
   ensure
-    t&.disable
-    Polyphony.trace(nil)
+    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.58'
+  version: '0.61'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -108,110 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: http_parser.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.34.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.34.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +222,7 @@ files:
 - examples/core/handling-signals.rb
 - examples/core/idle_gc.rb
 - examples/core/interrupt.rb
+- examples/core/message_based_supervision.rb
 - examples/core/nested.rb
 - examples/core/pingpong.rb
 - examples/core/queue.rb
@@ -437,11 +334,11 @@ files:
 - ext/polyphony/ring_buffer.c
 - ext/polyphony/ring_buffer.h
 - ext/polyphony/runqueue.c
+- ext/polyphony/runqueue.h
 - ext/polyphony/runqueue_ring_buffer.c
 - ext/polyphony/runqueue_ring_buffer.h
 - ext/polyphony/socket_extensions.c
 - ext/polyphony/thread.c
-- ext/polyphony/tracing.c
 - lib/polyphony.rb
 - lib/polyphony/adapters/fs.rb
 - lib/polyphony/adapters/irb.rb
@@ -451,7 +348,6 @@ files:
 - lib/polyphony/adapters/readline.rb
 - lib/polyphony/adapters/redis.rb
 - lib/polyphony/adapters/sequel.rb
-- lib/polyphony/adapters/trace.rb
 - lib/polyphony/core/channel.rb
 - lib/polyphony/core/exceptions.rb
 - lib/polyphony/core/global_api.rb
@@ -523,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby