polyphony 0.43.1 → 0.43.6

data/lib/polyphony/extensions/socket.rb

@@ -5,6 +5,16 @@ require 'socket'
 require_relative './io'
 require_relative '../core/thread_pool'
 
+class ::BasicSocket
+  def write_nonblock(string, _options = {})
+    write(string)
+  end
+
+  def read_nonblock(maxlen, str = nil, _options = {})
+    readpartial(maxlen, str)
+  end
+end
+
 # Socket overrides (eventually rewritten in C)
 class ::Socket
   def accept
@@ -77,6 +87,8 @@ end
 class ::TCPSocket
   NO_EXCEPTION = { exception: false }.freeze
 
+  attr_reader :io
+
   def initialize(remote_host, remote_port, local_host = nil, local_port = nil)
     @io = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
     if local_host && local_port

data/lib/polyphony/version.rb

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

data/test/q.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'fiber'
+require_relative '../lib/polyphony_ext'
+
+queue = Polyphony::LibevQueue.new
+
+queue.push :a
+queue.push :b
+queue.push :c
+p [queue.shift_no_wait]
+queue.push :d
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+p [queue.shift_no_wait]
+
+queue.unshift :e
+p [queue.shift_no_wait]
+
+queue.push :f
+queue.push :g
+p [queue.shift_no_wait]

data/test/test_agent.rb

@@ -21,10 +21,13 @@ class AgentTest < MiniTest::Test
     spin {
       @agent.sleep 0.01
       count += 1
-    }
-    suspend
-    assert Time.now - t0 >= 0.01
-    assert_equal 1, count
+      @agent.sleep 0.01
+      count += 1
+      @agent.sleep 0.01
+      count += 1
+    }.await
+    assert Time.now - t0 >= 0.03
+    assert_equal 3, count
   end
 
   def test_write_read_partial
@@ -88,10 +91,13 @@ class AgentTest < MiniTest::Test
       buf << :done
     end
 
+    # writing always causes snoozing
     o << 'foo'
     o << 'bar'
     o.close
-    snooze
+
+    # read_loop will snooze after every read
+    4.times { snooze }
 
     assert_equal [:ready, 'foo', 'bar', :done], buf
   end
@@ -105,12 +111,12 @@ class AgentTest < MiniTest::Test
     end
 
     c1 = TCPSocket.new('127.0.0.1', 1234)
-    snooze
+    10.times { snooze }
 
     assert_equal 1, clients.size
 
     c2 = TCPSocket.new('127.0.0.1', 1234)
-    snooze
+    10.times { snooze }
 
     assert_equal 2, clients.size
 

data/test/test_fiber.rb

@@ -482,9 +482,9 @@ class FiberTest < MiniTest::Test
   def test_select_from_multiple_fibers
     sleep 0
     buffer = []
-    f1 = spin { sleep 0.01; buffer << :foo; :foo }
-    f2 = spin { sleep 0.03; buffer << :bar; :bar }
-    f3 = spin { sleep 0.05; buffer << :baz; :baz }
+    f1 = spin { sleep 0.1; buffer << :foo; :foo }
+    f2 = spin { sleep 0.3; buffer << :bar; :bar }
+    f3 = spin { sleep 0.5; buffer << :baz; :baz }
 
     selected, result = Fiber.select(f1, f2, f3)
     assert_equal :foo, result

data/test/test_global_api.rb

@@ -106,7 +106,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.03
+    assert t1 - t0 < 0.1
     assert_nil v
   end
 
@@ -118,7 +118,7 @@ class MoveOnAfterTest < MiniTest::Test
     end
     t1 = Time.now
 
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
     assert_equal :bar, v
   end
 
@@ -129,7 +129,7 @@ class MoveOnAfterTest < MiniTest::Test
     assert_equal Fiber.current, f.parent
     v = sleep 1
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
     assert_equal 'foo', v
   end
 end
@@ -145,7 +145,7 @@ class CancelAfterTest < MiniTest::Test
       end
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
   end
 
   def test_cancel_after_without_block
@@ -157,7 +157,31 @@ class CancelAfterTest < MiniTest::Test
       sleep 1
     end
     t1 = Time.now
-    assert t1 - t0 < 0.02
+    assert t1 - t0 < 0.1
+  end
+
+  class CustomException < Exception
+  end
+
+  def test_cancel_after_with_custom_exception
+    assert_raises CustomException do
+      cancel_after(0.01, with_exception: CustomException) do
+        sleep 1
+        :foo
+      end
+    end
+
+    begin
+      e = nil
+      cancel_after(0.01, with_exception: 'foo') do
+        sleep 1
+        :foo
+      end
+    rescue => e
+    ensure
+      assert_kind_of RuntimeError, e
+      assert_equal 'foo', e.message
+    end
   end
 end
 
@@ -187,13 +211,13 @@ class SpinLoopTest < MiniTest::Test
 
   def test_spin_loop_location
     location = /^#{__FILE__}:#{__LINE__ + 1}/
-    f = spin_loop {}
+    f = spin_loop { snooze }
     
     assert_match location, f.location
   end
 
   def test_spin_loop_tag
-    f = spin_loop(:my_loop) {}
+    f = spin_loop(:my_loop) { snooze }
 
     assert_equal :my_loop, f.tag
   end
@@ -201,10 +225,13 @@ class SpinLoopTest < MiniTest::Test
   def test_spin_loop_with_rate
     buffer = []
     counter = 0
-    f = spin_loop(rate: 50) { buffer << (counter += 1) }
+    t0 = Time.now
+    f = spin_loop(rate: 10) { buffer << (counter += 1) }
     sleep 0.2
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 end
 
@@ -212,12 +239,15 @@ class ThrottledLoopTest < MiniTest::Test
   def test_throttled_loop
     buffer = []
     counter = 0
+    t0 = Time.now
     f = spin do
-      throttled_loop(50) { buffer << (counter += 1) }
+      throttled_loop(10) { buffer << (counter += 1) }
     end
-    sleep 0.2
+    sleep 0.3
     f.stop
-    assert counter >= 9 && counter <= 11
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert counter >= expected - 1 && counter <= expected + 1
   end
 
   def test_throttled_loop_with_count
@@ -243,19 +273,22 @@ class GlobalAPIEtcTest < MiniTest::Test
 
   def test_every
     buffer = []
+    t0 = Time.now
     f = spin do
-      every(0.01) { buffer << 1 }
+      every(0.1) { buffer << 1 }
     end
-    sleep 0.05
+    sleep 0.5
     f.stop
-    assert (4..5).include?(buffer.size)
+    elapsed = Time.now - t0
+    expected = (elapsed / 0.1).to_i
+    assert buffer.size >= expected - 2 && buffer.size <= expected + 2
   end
 
   def test_sleep
     t0 = Time.now
-    sleep 0.05
+    sleep 0.1
     elapsed = Time.now - t0
-    assert (0.045..0.08).include? elapsed
+    assert (0.05..0.15).include? elapsed
 
     f = spin { sleep }
     snooze

data/test/test_io.rb

@@ -30,6 +30,14 @@ class IOTest < MiniTest::Test
     assert_equal 'hello', msg
   end
 
+  def test_write_multiple_arguments
+    i, o = IO.pipe
+    count = o.write('a', 'b', "\n", 'c')
+    assert_equal 4, count
+    o.close
+    assert_equal "ab\nc", i.read
+  end
+
   def test_that_double_chevron_method_returns_io
     assert_equal @o, @o << 'foo'
 
@@ -121,7 +129,7 @@ class IOClassMethodsTest < MiniTest::Test
     assert_equal "end\n", lines[-1]
   end
 
-  def test_read
+  def test_read_class_method
     s = IO.read(__FILE__)
     assert_kind_of String, s
     assert(!s.empty?)
@@ -144,7 +152,7 @@ class IOClassMethodsTest < MiniTest::Test
 
   WRITE_DATA = "foo\nbar קוקו"
 
-  def test_write
+  def test_write_class_method
     fn = '/tmp/test_write'
     FileUtils.rm(fn) rescue nil
 

data/test/test_queue.rb

@@ -8,7 +8,7 @@ class QueueTest < MiniTest::Test
     @queue = Polyphony::Queue.new
   end
 
-  def test_pop
+  def test_push_shift
     spin {
       @queue << 42
     }
@@ -21,6 +21,18 @@ class QueueTest < MiniTest::Test
     assert_equal [1, 2, 3, 4], buf
   end
 
+  def test_unshift
+    @queue.push 1
+    @queue.push 2
+    @queue.push 3
+    @queue.unshift 4
+
+    buf = []
+    buf << @queue.shift while !@queue.empty?
+
+    assert_equal [4, 1, 2, 3], buf
+  end
+
   def test_multiple_waiters
     a = spin { @queue.shift }
     b = spin { @queue.shift }
@@ -41,6 +53,19 @@ class QueueTest < MiniTest::Test
     buf = []
     @queue.shift_each { |i| buf << i }
     assert_equal [1, 2, 3, 4], buf
+
+    buf = []
+    @queue.shift_each { |i| buf << i }
+    assert_equal [], buf
+  end
+
+  def test_shift_all
+    (1..4).each { |i| @queue << i }
+    buf = @queue.shift_all
+    assert_equal [1, 2, 3, 4], buf
+
+    buf = @queue.shift_all
+    assert_equal [], buf
   end
 
   def test_empty?

data/test/test_resource_pool.rb

@@ -123,4 +123,16 @@ class ResourcePoolTest < MiniTest::Test
     pool.preheat!
     assert_equal 2, pool.size
   end
+
+  def test_reentrant_resource_pool
+    resources = [+'a', +'b']
+    pool = Polyphony::ResourcePool.new(limit: 1) { resources.shift }
+
+    pool.acquire do |r|
+      assert_equal 'a', r
+      pool.acquire do |r|
+        assert_equal 'a', r
+      end
+    end
+  end
 end

data/test/test_socket.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
+require 'localhost/authority'
 
 class SocketTest < MiniTest::Test
   def setup
@@ -31,4 +32,46 @@ class SocketTest < MiniTest::Test
     server_fiber&.await
     server&.close
   end
+
+  def test_openssl
+    authority = Localhost::Authority.fetch
+    context = authority.server_context
+    port = rand(1234..5678)
+    sock = TCPServer.new('127.0.0.1', port)
+    server = OpenSSL::SSL::SSLServer.new(sock, context)
+
+    server_fiber = spin do
+      while (socket = server.accept)
+        puts "accepted: #{socket.inspect}"
+        spin do
+          while (data = socket.gets(8192))
+            socket << data
+          end
+        end
+      end
+    end
+
+    snooze
+    p 1
+    sock = TCPSocket.new('127.0.0.1', port)
+    p 2
+    sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+    context = OpenSSL::SSL::SSLContext.new
+    context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    client = OpenSSL::SSL::SSLSocket.new(sock, context)
+    client.sync_close = true
+    client.hostname = 'localhost'
+    p 3
+    client.connect
+    p 4
+    client.write("GET / HTTP/1.0\r\nHost: realiteq.net\r\n\r\n")#("1234\n")
+    p 5
+    assert_equal "1234\n", client.readpartial(8192)
+    p 6
+    client.close
+  ensure
+    server_fiber&.stop
+    server_fiber&.await
+    server&.close
+  end
 end

data/test/test_throttler.rb

@@ -4,14 +4,15 @@ require_relative 'helper'
 
 class ThrottlerTest < MiniTest::Test
   def test_throttler_with_rate
-    t = Polyphony::Throttler.new(100)
+    t = Polyphony::Throttler.new(10)
     buffer = []
+    t0 = Time.now
     f = spin { loop { t.process { buffer << 1 } } }
-    sleep 0.02
+    sleep 0.2
     f.stop
-    snooze
-    assert buffer.size >= 2
-    assert buffer.size <= 3
+    elapsed = Time.now - t0
+    expected = (elapsed * 10).to_i
+    assert buffer.size >= expected - 1 && buffer.size <= expected + 1
   ensure
     t.stop
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.43.1
+  version: 0.43.6
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -242,6 +242,8 @@ files:
 - TODO.md
 - bin/polyphony-debug
 - docs/_config.yml
+- docs/_includes/head.html
+- docs/_includes/title.html
 - docs/_sass/custom/custom.scss
 - docs/_sass/overrides.scss
 - docs/_user-guide/all-about-timers.md
@@ -280,10 +282,12 @@ files:
 - docs/main-concepts/fiber-scheduling.md
 - docs/main-concepts/index.md
 - docs/polyphony-logo.png
+- examples/adapters/concurrent-ruby.rb
 - examples/adapters/pg_client.rb
 - examples/adapters/pg_notify.rb
 - examples/adapters/pg_pool.rb
 - examples/adapters/pg_transaction.rb
+- examples/adapters/redis_blpop.rb
 - examples/adapters/redis_channels.rb
 - examples/adapters/redis_client.rb
 - examples/adapters/redis_pubsub.rb
@@ -296,6 +300,7 @@ files:
 - examples/core/xx-at_exit.rb
 - examples/core/xx-caller.rb
 - examples/core/xx-channels.rb
+- examples/core/xx-daemon.rb
 - examples/core/xx-deadlock.rb
 - examples/core/xx-deferring-an-operation.rb
 - examples/core/xx-erlang-style-genserver.rb
@@ -348,8 +353,10 @@ files:
 - examples/io/xx-system.rb
 - examples/io/xx-tcpserver.rb
 - examples/io/xx-tcpsocket.rb
+- examples/io/xx-zip.rb
 - examples/performance/fs_read.rb
 - examples/performance/mem-usage.rb
+- examples/performance/messaging.rb
 - examples/performance/multi_snooze.rb
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
@@ -363,6 +370,7 @@ files:
 - examples/performance/xx-array.rb
 - examples/performance/xx-fiber-switch.rb
 - examples/performance/xx-snooze.rb
+- examples/xx-spin.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
@@ -388,6 +396,8 @@ files:
 - ext/polyphony/polyphony.c
 - ext/polyphony/polyphony.h
 - ext/polyphony/polyphony_ext.c
+- ext/polyphony/ring_buffer.c
+- ext/polyphony/ring_buffer.h
 - ext/polyphony/thread.c
 - ext/polyphony/tracing.c
 - lib/polyphony.rb
@@ -417,6 +427,7 @@ files:
 - test/coverage.rb
 - test/eg.rb
 - test/helper.rb
+- test/q.rb
 - test/run.rb
 - test/stress.rb
 - test/test_agent.rb