polyphony 0.94 → 0.96

data/lib/polyphony/adapters/redis.rb

@@ -2,94 +2,35 @@
 
 require_relative '../../polyphony'
 
-require 'redis'
-require 'hiredis/reader'
-
-# Polyphony-based Redis driver
-class Polyphony::RedisDriver
-
-  # Connects to a Redis server using the given config.
-  #
-  # @return [TCPSocket, UNIXSocket, SSLSocket] client connectio
-  def self.connect(config)
-    raise 'unix sockets not supported' if config[:scheme] == 'unix'
-
-    # connection.connect_unix(config[:path], connect_timeout)
-
-    raise 'ssl not supported' if config[:scheme] == 'rediss' || config[:ssl]
-
-    # raise NotImplementedError, "SSL not supported by hiredis driver"
-
-    new(config[:host], config[:port])
-    # connection.connect(config[:host], config[:port], connect_timeout)
-  end
-
-  # Initializes a Redis client connection.
-  #
-  # @param host [String] hostname
-  # @param port [Integer] port number
-  def initialize(host, port)
-    @connection = Polyphony::Net.tcp_connect(host, port)
-    @reader = ::Hiredis::Reader.new
-  end
-
-  # Returns true if connected to server.
-  #
-  # @return [bool] is connected to server
-  def connected?
-    @connection && !@connection.closed?
-  end
-
-  # Sets a timeout for the connection.
-  #
-  # @return [void]
-  def timeout=(timeout)
-    # ignore timeout for now
-  end
-
-  # Disconnects from the server.
-  #
-  # @return [void]
-  def disconnect
-    @connection.close
-    @connection = nil
-  end
-
-  # Sends a command to the server.
-  #
-  # @param command [Array] Redis command
-  # @return [void]
-  def write(command)
-    @connection.write(format_command(command))
-  end
-
-  # Formats a command for sending to server.
-  #
-  # @param args [Array] command
-  # @return [String] formatted command
-  def format_command(args)
-    args = args.flatten
-    (+"*#{args.size}\r\n").tap do |s|
-      args.each do |a|
-        a = a.to_s
-        s << "$#{a.bytesize}\r\n#{a}\r\n"
+require 'redis-client'
+
+class RedisClient
+  class RubyConnection
+    class BufferedIO
+      def fill_buffer(strict, size = @chunk_size)
+        remaining = size
+        empty_buffer = @offset >= @buffer.bytesize
+
+        loop do
+          max_read = [remaining, @chunk_size].max
+          bytes = if empty_buffer
+            @io.readpartial(max_read, @buffer)
+          else
+            @io.readpartial(max_read)
+          end
+
+          raise Errno::ECONNRESET if bytes.nil?
+
+          if empty_buffer
+            @offset = 0
+            empty_buffer = false
+          else
+            @buffer << bytes
+          end
+          remaining -= bytes.bytesize
+          return if !strict || remaining <= 0
+        end
       end
     end
   end
-
-  # Reads from the connection, feeding incoming data to the parser.
-  #
-  # @return [void]
-  def read
-    reply = @reader.gets
-    return reply if reply
-
-    @connection.read_loop do |data|
-      @reader.feed(data)
-      reply = @reader.gets
-      return reply unless reply == false
-    end
-  end
 end
-
-Redis::Connection.drivers << Polyphony::RedisDriver

data/lib/polyphony/core/channel.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative '../../polyphony'
+
+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

data/lib/polyphony/core/sync.rb

@@ -101,6 +101,8 @@ module Polyphony
     #
     # @return [void]
     def signal
+      return if @queue.empty?
+
       fiber = @queue.shift
       fiber.schedule
     end
@@ -109,6 +111,8 @@ module Polyphony
     #
     # @return [void]
     def broadcast
+      return if @queue.empty?
+
       while (fiber = @queue.shift)
         fiber.schedule
       end

data/lib/polyphony/debugger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'polyphony/extensions/debug'
+require 'polyphony/core/debug'
 
 module Polyphony
   TP_EVENTS = [
@@ -188,7 +188,7 @@ module Polyphony
     def start_server_thread
       @thread = Thread.new do
         puts("Listening on #{@socket_path}")
-        FileUtils.rm(@socket_path) if File.exists?(@socket_path)
+        FileUtils.rm(@socket_path) if File.exist?(@socket_path)
         socket = UNIXServer.new(@socket_path)
         loop do
           @client = socket.accept

data/lib/polyphony/extensions/socket.rb

@@ -194,6 +194,8 @@ class ::Socket
   def readpartial(maxlen, buf = +'', buf_pos = 0, raise_on_eof = true)
     result = Polyphony.backend_recv(self, buf, maxlen, buf_pos)
     raise EOFError if !result && raise_on_eof
+
+    result
   end
 
   ZERO_LINGER = [0, 0].pack('ii').freeze

data/lib/polyphony/version.rb

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

data/lib/polyphony.rb

@@ -117,6 +117,10 @@ module Polyphony
   $VERBOSE = nil
   Object.const_set(:Queue, Polyphony::Queue)
   Object.const_set(:Mutex, Polyphony::Mutex)
+  
+  require 'monitor'
+  Object.const_set(:Monitor, Polyphony::Mutex)
+
   Object.const_set(:ConditionVariable, Polyphony::ConditionVariable)
   $VERBOSE = verbose
 end

data/polyphony.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://digital-fabric.github.io/polyphony'
   s.metadata    = {
     "source_code_uri" => "https://github.com/digital-fabric/polyphony",
+    # "documentation_uri" => "https://www.rubydoc.info/gems/polyphony",
     "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"
@@ -19,18 +20,17 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"]
   s.extensions = ["ext/polyphony/extconf.rb"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 3.0'
 
-  s.add_development_dependency  'rake-compiler',        '1.1.1'
-  s.add_development_dependency  'minitest',             '5.14.4'
-  s.add_development_dependency  'minitest-reporters',   '1.4.2'
-  s.add_development_dependency  'simplecov',            '0.17.1'
-  s.add_development_dependency  'rubocop',              '0.85.1'
-  s.add_development_dependency  'pry',                  '0.13.1'
+  s.add_development_dependency  'rake-compiler',        '1.2.1'
+  s.add_development_dependency  'minitest',             '5.17.0'
+  s.add_development_dependency  'simplecov',            '0.22.0'
+  s.add_development_dependency  'rubocop',              '1.45.1'
+  s.add_development_dependency  'pry',                  '0.14.2'
 
-  s.add_development_dependency  'msgpack',              '1.4.2'
-  s.add_development_dependency  'httparty',             '0.17.1'
-  s.add_development_dependency  'localhost',            '~>1.1.4'
+  s.add_development_dependency  'msgpack',              '1.6.0'
+  s.add_development_dependency  'httparty',             '0.21.0'
+  s.add_development_dependency  'localhost',            '1.1.10'
 
   # s.add_development_dependency  'jekyll',               '~>3.8.6'
   # s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'

data/test/helper.rb

@@ -11,16 +11,11 @@ require 'fileutils'
 require_relative './eg'
 
 require 'minitest/autorun'
-require 'minitest/reporters'
 
 ::Exception.__disable_sanitized_backtrace__ = true
 
 IS_LINUX = RUBY_PLATFORM =~ /linux/
 
-# Minitest::Reporters.use! [
-#   Minitest::Reporters::SpecReporter.new
-# ]
-
 module ::Kernel
   def trace(*args)
     STDOUT.orig_write(format_trace(args))

data/test/test_backend.rb

@@ -144,8 +144,12 @@ class BackendTest < MiniTest::Test
       buf << :done
     end
 
-    # writing always causes snoozing
+    # Caution: we want to read in two chunks, that a race condition lurks here:
+    # writing always causes snoozing, but that might not be enough for the
+    # reader fiber to perform the read before the second write, so for the test
+    # to work consistently we add a little sleep between the two writes.
     o << 'foo'
+    sleep 0.03
     o << 'bar'
     o.close
 

data/test/test_enumerator.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class EnumeratorTest < MiniTest::Test
+  def test_each_enumerator
+    o = [1, 2, 3]
+    e = o.each
+
+    r = []
+    loop do
+      r << e.next
+    rescue StopIteration
+      break
+    end
+
+    assert_equal o, r
+  end
+
+  def test_custom_io_enumerator
+    i, o = IO.pipe
+
+    spin do
+      10.times { o.puts 'foo' }
+      o.close
+    end
+
+    e_fiber = nil
+    e = Enumerator.new do |y|
+      e_fiber ||= Fiber.current
+      while (l = i.gets)
+        y << l
+      end
+    end
+
+    r = []
+    loop do
+      r << e.next
+    rescue StopIteration
+      break
+    end
+
+    assert_equal ["foo\n"] * 10, r
+    assert Fiber.current != e_fiber
+  end
+end

data/test/test_ext.rb

@@ -39,6 +39,69 @@ class ExceptionTest < MiniTest::Test
     Exception.__disable_sanitized_backtrace__ = prev_disable
   end
 
+  LOCATION_ONLY = ->(s) { s =~ /^(.+)\:in / && Regexp.last_match[1] }
+
+  def test_backtrace_on_main_fiber
+    base = caller.map(&LOCATION_ONLY)
+    begin
+      lineno = __LINE__ + 1
+      raise 'foo'
+    rescue => e
+    end
+
+    assert !!e
+
+    bt = e.backtrace.map(&LOCATION_ONLY)
+    assert_equal ["#{__FILE__}:#{lineno}"] + base, bt
+  end
+
+  def test_backtrace_on_child_fiber
+    Exception.__disable_sanitized_backtrace__ = false
+
+    lineno = __LINE__ + 1
+    fiber = spin do
+      raise receive
+    end
+
+    base = caller.map(&LOCATION_ONLY)
+
+    begin
+      fiber << 'foo'
+      fiber.await
+    rescue => e
+    end
+
+    assert !!e
+    bt = e.backtrace.map(&LOCATION_ONLY)
+    assert_equal ["#{__FILE__}:#{lineno + 1}", "#{__FILE__}:#{lineno}"] + base, bt
+  ensure
+    Exception.__disable_sanitized_backtrace__ = true
+  end
+
+  def test_backtrace_on_grand_child_fiber
+    Exception.__disable_sanitized_backtrace__ = false
+
+    lineno = __LINE__ + 1
+    f1 = spin do
+      f2 = spin do
+        raise 'foo'
+      end
+      f2.await
+    end
+
+    base = caller.map(&LOCATION_ONLY)
+
+    begin
+      f1.await
+    rescue => e
+    end
+
+    assert !!e
+    bt = e.backtrace.map(&LOCATION_ONLY)
+    assert_equal ["#{__FILE__}:#{lineno + 2}", "#{__FILE__}:#{lineno + 1}", "#{__FILE__}:#{lineno}"] + base, bt
+  ensure
+    Exception.__disable_sanitized_backtrace__ = true
+  end
 end
 
 class ProcessTest < MiniTest::Test