polyphony 0.78 → 0.81

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,171 @@ 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
+
+  def test_event_firehose_with_threaded_receiver
+    buffer = []
+    this = Fiber.current
+    receiver = Thread.new {
+      this << :ok
+      loop {
+        e = receive
+        break if e == :stop
+        buffer << e
+      }
+    }
+    receive
+    
+    Polyphony::Trace.start_event_firehose { |e| receiver << e }
+
+    f1 = spin(:f1) do
+      receive
+    end
+
+    f1 << :foo
+    f1.await
+
+    Thread.backend.trace_proc = nil
+    receiver << :stop
+    receiver.await
+
+    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_reentrancy
+  #   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
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.78'
+  version: '0.81'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-03-03 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:
@@ -249,6 +249,7 @@ files:
 - examples/core/trap2.rb
 - examples/core/using-a-mutex.rb
 - examples/core/worker-thread.rb
+- examples/core/zlib_stream.rb
 - examples/io/backticks.rb
 - examples/io/echo_client.rb
 - examples/io/echo_client_from_stdin.rb
@@ -358,7 +359,6 @@ files:
 - lib/polyphony/adapters/readline.rb
 - lib/polyphony/adapters/redis.rb
 - lib/polyphony/adapters/sequel.rb
-- lib/polyphony/core/channel.rb
 - lib/polyphony/core/debug.rb
 - lib/polyphony/core/exceptions.rb
 - lib/polyphony/core/global_api.rb
@@ -373,6 +373,7 @@ files:
 - lib/polyphony/extensions/fiber.rb
 - lib/polyphony/extensions/io.rb
 - lib/polyphony/extensions/kernel.rb
+- lib/polyphony/extensions/object.rb
 - lib/polyphony/extensions/openssl.rb
 - lib/polyphony/extensions/process.rb
 - lib/polyphony/extensions/socket.rb
@@ -415,7 +416,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
@@ -434,8 +435,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby
 test_files: []

data/lib/polyphony/core/channel.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './exceptions'
-
-module Polyphony
-  # Implements a unidirectional communication channel along the lines of Go
-  # (buffered) channels.
-  class Channel < Polyphony::Queue
-    alias_method :receive, :shift
-
-    def close
-      flush_waiters(Polyphony::MoveOn.new)
-    end
-  end
-end