polyphony 0.28 → 0.29

data/test/test_throttler.rb

@@ -16,13 +16,15 @@ class ThrottlerTest < MiniTest::Test
   end
 
   def test_throttler_with_hash_of_rate
-    t = Polyphony::Throttler.new(rate: 100)
+    t = Polyphony::Throttler.new(rate: 20)
     buffer = []
-    f = spin { loop { t.process { buffer << 1 } } }
-    sleep 0.02
+    f = spin do
+      loop { t.process { buffer << 1 } }
+    end
+    sleep 0.25
     f.stop
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    puts "count: #{buffer.size}"
+    assert (2..6).include?(buffer.size)
   ensure
     t.stop
   end

data/test/test_trace.rb

@@ -10,15 +10,15 @@ class TraceTest < MiniTest::Test
     snooze
     assert_equal 0, records.size
   ensure
-    t.disable
+    t&.disable
     Gyro.trace(nil)
   end
 
   def test_tracing_enabled
     records = []
-    t = Polyphony::Trace.new { |r| records << r if r[:event] =~ /^fiber_/ }
-    t.enable
+    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if r[:event] =~ /^fiber_/ }
     Gyro.trace(true)
+    t.enable
     snooze
     t.disable
     
@@ -27,13 +27,13 @@ class TraceTest < MiniTest::Test
     assert_equal [:fiber_schedule, :fiber_switchpoint, :fiber_run], events
     assert_equal [Fiber.current], records.map { |r| r[:fiber] }.uniq
   ensure
-    t.disable
+    t&.disable
     Gyro.trace(nil)
   end
 
   def test_2_fiber_trace
     records = []
-    t = Polyphony::Trace.new { |r| records << r if r[:event] =~ /^fiber_/ }
+    t = Polyphony::Trace.new(:fiber_all) { |r| records << r if r[:event] =~ /^fiber_/ }
     t.enable
     Gyro.trace(true)
 
@@ -60,7 +60,7 @@ class TraceTest < MiniTest::Test
       [Fiber.current, :fiber_run]
     ], events
   ensure
-    t.disable
+    t&.disable
     Gyro.trace(nil)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.28'
+  version: '0.29'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
@@ -255,6 +255,8 @@ files:
 - TODO.md
 - docs/_config.yml
 - docs/_includes/nav.html
+- docs/_includes/prevnext.html
+- docs/_layouts/default.html
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
 - docs/assets/img/echo-fibers.svg
@@ -271,6 +273,7 @@ files:
 - docs/technical-overview/extending.md
 - docs/technical-overview/fiber-scheduling.md
 - docs/user-guide.md
+- docs/user-guide/all-about-timers.md
 - docs/user-guide/web-server.md
 - examples/core/01-spinning-up-fibers.rb
 - examples/core/02-awaiting-fibers.rb
@@ -279,17 +282,17 @@ files:
 - examples/core/xx-deadlock.rb
 - examples/core/xx-deferring-an-operation.rb
 - examples/core/xx-erlang-style-genserver.rb
-- examples/core/xx-extended_fibers.rb
 - examples/core/xx-forking.rb
 - examples/core/xx-move_on.rb
-- examples/core/xx-mt-scheduler.rb
 - examples/core/xx-queue-async.rb
 - examples/core/xx-readpartial.rb
 - examples/core/xx-recurrent-timer.rb
 - examples/core/xx-resource_cancel.rb
 - examples/core/xx-resource_delegate.rb
 - examples/core/xx-signals.rb
+- examples/core/xx-sleep-forever.rb
 - examples/core/xx-sleeping.rb
+- examples/core/xx-snooze-starve.rb
 - examples/core/xx-spin_error_backtrace.rb
 - examples/core/xx-state-machine.rb
 - examples/core/xx-supervisors.rb
@@ -302,6 +305,7 @@ files:
 - examples/core/xx-timeout.rb
 - examples/core/xx-trace.rb
 - examples/core/xx-using-a-mutex.rb
+- examples/core/xx-worker-thread.rb
 - examples/interfaces/pg_client.rb
 - examples/interfaces/pg_notify.rb
 - examples/interfaces/pg_pool.rb
@@ -317,6 +321,7 @@ files:
 - examples/io/xx-echo_server.rb
 - examples/io/xx-echo_server_with_timeout.rb
 - examples/io/xx-echo_stdin.rb
+- examples/io/xx-happy-eyeballs.rb
 - examples/io/xx-httparty.rb
 - examples/io/xx-irb.rb
 - examples/io/xx-net-http.rb
@@ -440,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 'Polyphony: Fiber-based Concurrency for Ruby'

data/examples/core/xx-extended_fibers.rb

@@ -1,150 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'fiber'
-
-## An experiment to see if the Coprocess class could be implemented as an
-## extension for the stock Fiber (since it's already enhanced)
-
-class Fiber
-  def self.spin(&block)
-    new(&wrap_block(block)).set_block(block).tap { |f| f.schedule }
-  end
-
-  attr_accessor :__block__
-
-  def self.wrap_block(block)
-    calling_fiber = Fiber.current
-    proc { |v| Fiber.current.run(v, calling_fiber, &block) }
-  end
-
-  def run(v, calling_fiber)
-    raise v if v.is_a?(Exception)
-
-    @running = true
-    result = yield v
-    @running = nil
-    schedule_waiting_fibers(result)
-    Fiber.run_next_fiber
-  rescue Exception => e
-    @running = nil
-    parent_fiber = calling_fiber.running? ? calling_fiber : Fiber.main_fiber
-    parent_fiber.transfer(e)
-  end
-
-  def running?
-    @running
-  end
-
-  def set_block(block)
-    @__block__ = block
-    self
-  end
-
-  def inspect
-    if @__block__
-      "<Fiber:#{object_id} #{@__block__.source_location.join(':')} (#{__scheduled_value__.inspect})>"
-    else
-      "<Fiber:#{object_id} (main) (#{__scheduled_value__.inspect})>"
-    end
-  end
-  alias_method :to_s, :inspect
-
-  # scheduling
-  @@scheduled_head = nil
-  @@scheduled_tail = nil
-
-  attr_accessor :__scheduled_next__
-  attr_accessor :__scheduled_value__
-
-  def self.snooze
-    current.schedule
-    yield_to_next
-  end
-
-  def self.suspend
-    yield_to_next
-  end
-
-  @@main_fiber = Fiber.current
-
-  def self.main_fiber
-    @@main_fiber
-  end
-
-  def self.yield_to_next
-    v = Fiber.run_next_fiber
-    v.is_a?(Exception) ? (raise v) : v
-  end
-
-  def self.run_next_fiber
-    unless @@scheduled_head
-      return main_fiber.transfer
-    end
-
-    next_fiber = @@scheduled_head
-    next_next_fiber = @@scheduled_head.__scheduled_next__
-    next_fiber.__scheduled_next__ = nil
-    if next_next_fiber
-      @@scheduled_head = next_next_fiber
-    else
-      @@scheduled_head = @@scheduled_tail = nil
-    end
-    next_fiber.transfer(next_fiber.__scheduled_value__)
-  end
-
-  def schedule(value = nil)
-    @__scheduled_value__ = value
-    if @@scheduled_head
-      @@scheduled_tail.__scheduled_next__ = self
-      @@scheduled_tail = self
-    else
-      @@scheduled_head = @@scheduled_tail = self
-    end
-  end
-
-  def await
-    current_fiber = Fiber.current
-    if @waiting_fiber
-      if @waiting_fiber.is_a?(Array)
-        @waiting_fiber << current_fiber
-      else
-        @waiting_fiber = [@waiting_fiber, current_fiber]
-      end
-    else
-      @waiting_fiber = current_fiber
-    end
-    Fiber.suspend
-  end
-
-  def schedule_waiting_fibers(v)
-    case @waiting_fiber
-    when Array then @waiting_fiber.each { |f| f.schedule(v) }
-    when Fiber then @waiting_fiber.schedule(v)
-    end
-  end
-end
-
-f1 = Fiber.spin {
-  p Fiber.current
-  Fiber.snooze
-  3.times {
-    STDOUT << '*'
-    Fiber.snooze
-  }
-  :foo
-}
-
-f2 = Fiber.spin {
-  p Fiber.current
-  Fiber.snooze
-  10.times {
-    STDOUT << '.'
-    Fiber.snooze
-  }
-}
-
-# v = f1.await
-# puts "done waiting #{v.inspect}"
-
-Fiber.suspend

data/examples/core/xx-mt-scheduler.rb

@@ -1,349 +0,0 @@
-# frozen_string_literal: true
-
-require 'fiber'
-
-## An experiment to see if the Coprocess class could be implemented as an
-## extension for the stock Fiber (since it's already enhanced)
-
-class Thread
-  attr_accessor :main_fiber
-
-  alias_method :orig_initialize, :initialize
-  def initialize(*args, &block)
-    orig_initialize do
-      Fiber.current.setup_main_fiber
-      block.(*args)
-    end
-  end
-
-  def fiber_scheduler
-    @fiber_scheduler ||= Scheduler.new
-  end
-end
-
-class Scheduler
-  def initialize
-    # @mutex = Mutex.new
-    @queue = Queue.new
-  end
-
-  def <<(fiber)
-    @queue << fiber
-    # @mutex.synchronize do
-    #   if @head
-    #     @tail.__scheduled_next__ = @tail = fiber
-    #   else
-    #     @head = @tail = fiber
-    #   end
-    # end
-  end
-
-  def switch
-    next_fiber = nil
-    while true
-      next_fiber = @queue.empty? ? Thread.current.main_fiber : @queue.pop# unless @queue.empty?
-      # next_fiber = @queue.empty? ? nil : @queue.pop
-      # puts "next_fiber: #{next_fiber.inspect}"
-      # next_fiber = @mutex.synchronize { @head }
-      break if next_fiber
-      sleep 0
-    end
-
-    # next_next_fiber = next_fiber.__scheduled_next__
-    # next_fiber.__scheduled_next__ = nil
-    next_fiber.__scheduled__ = nil
-    # @mutex.synchronize { @head = next_next_fiber || (@tail = nil) }
-    next_fiber.transfer(next_fiber.__scheduled_value__)
-  end
-
-  def handle_events
-  end
-end
-
-class Fiber
-  def self.spin(&block)
-    new(&wrap_block(block)).setup(block)
-  end
-
-  attr_accessor :__block__
-  attr_reader :scheduler
-
-  def self.wrap_block(block)
-    calling_fiber = Fiber.current
-    proc { |v| Fiber.current.run(v, calling_fiber, &block) }
-  end
-
-  def run(v, calling_fiber)
-    raise v if v.is_a?(Exception)
-
-    @running = true
-    result = yield v
-    @running = nil
-    schedule_waiting_fibers(result)
-    @scheduler.switch
-  rescue Exception => e
-    @running = nil
-    parent_fiber = calling_fiber.running? ? calling_fiber : Thread.current.main_fiber
-    parent_fiber.transfer(e)
-  end
-
-  def running?
-    @running
-  end
-
-  def setup(block)
-    @scheduler = Thread.current.fiber_scheduler
-    @__block__ = block
-    schedule
-    self
-  end
-
-  def setup_main_fiber
-    @scheduler = Thread.current.fiber_scheduler
-    Thread.current.main_fiber = self
-  end
-
-  Fiber.current.setup_main_fiber
-
-  attr_reader :__scheduled_value__
-  # attr_accessor :__scheduled_next__
-  attr_accessor :__scheduled__
-
-  def inspect
-    if @__block__
-      "<Fiber:#{object_id} #{@__block__.source_location.join(':')} (#{@__scheduled_value__.inspect})>"
-    else
-      "<Fiber:#{object_id} (main) (#{@__scheduled_value__.inspect})>"
-    end
-  end
-  alias_method :to_s, :inspect
-
-  def self.snooze
-    current.schedule
-    yield_to_next
-  end
-
-  def self.suspend
-    yield_to_next
-  end
-
-  def self.yield_to_next
-    v = current.scheduler.switch
-    v.is_a?(Exception) ? (raise v) : v
-  end
-
-  def schedule(value = nil)
-    return if @__scheduled__
-
-    @__scheduled__ = true
-    @__scheduled_value__ = value
-    @scheduler << self
-  end
-
-  def await
-    current_fiber = Fiber.current
-    if @waiting_fiber
-      if @waiting_fiber.is_a?(Array)
-        @waiting_fiber << current_fiber
-      else
-        @waiting_fiber = [@waiting_fiber, current_fiber]
-      end
-    else
-      @waiting_fiber = current_fiber
-    end
-    Fiber.suspend
-  end
-
-  def schedule_waiting_fibers(v)
-    case @waiting_fiber
-    when Array then @waiting_fiber.each { |f| f.schedule(v) }
-    when Fiber then @waiting_fiber.schedule(v)
-    end
-  end
-end
-
-# f1 = Fiber.spin {
-#   p Fiber.current
-#   Fiber.snooze
-#   3.times {
-#     STDOUT << '*'
-#     Fiber.snooze
-#   }
-#   :foo
-# }
-
-# f2 = Fiber.spin {
-#   p Fiber.current
-#   Fiber.snooze
-#   10.times {
-#     STDOUT << '.'
-#     Fiber.snooze
-#   }
-#   puts
-# }
-
-# v = f1.await
-# puts "done waiting #{v.inspect}"
-
-def test_single_thread(x, y)
-  x.times {
-    Fiber.spin {
-      y.times { |i| Fiber.snooze }
-    }
-  }
-
-  Fiber.suspend
-end
-
-def spin_char(char)
-  Fiber.spin {
-    loop {
-      STDOUT << char
-      Fiber.snooze
-    }
-  }
-end
-
-def test_two_threads
-  Thread.new {
-    spin_char('.')
-    spin_char(':')
-    Fiber.suspend
-  }
-
-  Thread.new {
-    spin_char('*')
-    spin_char('@')
-    Fiber.suspend
-  }
-end
-
-# test_two_threads
-# sleep
-
-def test_perf(x, y)
-  puts "* #{x} fibers #{y} times"
-  3.times do
-    t0 = Time.now
-    # test_single_thread(1, 1000)
-    test_single_thread(x, y)
-    elapsed = Time.now - t0
-    rate = (x * y / (Time.now - t0)).to_i
-    puts "#{rate} switches/sec"
-  end
-end
-
-loop {
-  test_perf(1, 100000)
-}
-test_perf(10, 10000)
-test_perf(100, 1000)
-test_perf(1000, 100)
-test_perf(10000, 10)
-exit!
-
-def ping_pong
-  STDOUT.sync = true
-  f1 = nil
-  f2 = nil
-  count1 = 0
-  count2 = 0
-
-  Thread.new do
-    f1 = Fiber.spin {
-      loop {
-        count1 += 1
-        # STDOUT << '.'
-        f2&.schedule
-        Fiber.suspend
-      }
-    }
-    Fiber.suspend
-  end
-
-  Thread.new do
-    f2 = Fiber.spin {
-      loop {
-        count2 += 1
-        # STDOUT << '*'
-        f1&.schedule
-        Fiber.suspend
-      }
-    }
-    Fiber.suspend
-  end
-
-  Thread.new do
-    last_count1 = 0
-    last_count2 = 0
-    last_t = Time.now
-    loop {
-      sleep 1
-      t = Time.now
-      e = t - last_t
-      c1 = count1
-      c2 = count2
-      delta1 = c1 - last_count1
-      delta2 = c2 - last_count2
-      rate1 = (delta1.to_f / e).to_i
-      rate2 = (delta2.to_f / e).to_i
-      puts "#{rate1} #{rate2} (#{rate1 + rate2})"
-      last_count1 = c1
-      last_count2 = c2
-      last_t = t
-    }
-  end
-end
-
-ping_pong
-sleep
-exit!
-
-def ping_pong_st
-  STDOUT.sync = true
-  f1 = nil
-  f2 = nil
-  count1 = 0
-  count2 = 0
-
-  f1 = Fiber.spin {
-    loop {
-      count1 += 1
-      # STDOUT << '.'
-      f2&.schedule
-      Fiber.suspend
-    }
-  }
-
-  f2 = Fiber.spin {
-    last_count1 = 0
-    last_count2 = 0
-    last_t = Time.now
-
-    loop {
-      count2 += 1
-      # STDOUT << '*'
-      f1&.schedule
-      Fiber.suspend
-
-      next unless count2 % 100000 == 0
-
-      t = Time.now
-      e = t - last_t
-      c1 = count1
-      c2 = count2
-      delta1 = c1 - last_count1
-      delta2 = c2 - last_count2
-      rate1 = (delta1.to_f / e).to_i
-      rate2 = (delta2.to_f / e).to_i
-      puts "#{rate1} #{rate2} (#{rate1 + rate2})"
-      last_count1 = c1
-      last_count2 = c2
-      last_t = t
-    }
-  }
-
-end
-
-ping_pong_st
-Fiber.suspend