polyphony 0.53.2 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d656c0aad868a468632949355b617821b6a66aa4da69a994ea7afbc4af46e97b
-  data.tar.gz: edc45b184b0b50940925a1a1db56b0106ded10906ca181513e38450bc320e828
+  metadata.gz: 7c88e804739b62a55f7647c57e55582d2ae5cf6a73bca55160aa90138b80217a
+  data.tar.gz: ecbeb0aeed96a7b6f21f8d41b67195574213b8b01b51bccd0f1bcf59165ab9f6
 SHA512:
-  metadata.gz: f346672c82eee4055ec6c8f7fc1103850fd622a031ebf1c096e9ab130e3aa0b37c559d2b2f953f6b1bd721e4421199800fc0de54993a0c802ddadfa873f35030
-  data.tar.gz: 8273d691c2ed19ca04207380ea99392c7f65fefe6600c4a9bf9cc20a802f41e34b471e3af8d5adccf29c783c2f0c17610896fae2c183ac26b601c34dc27a5ce2
+  metadata.gz: 93ff227cab8891c79bc4447c25359df03cd675ada579d13c5dc09d1f18e42fd00ed1b3ce5e433bd5addf83076af3a45c29cdd49ae8cb2cb9f19892cb27a40476
+  data.tar.gz: 1e1f39c19d2edbd49406c3a3917848951914c48b81316fff6ff78f381fb7db70b407dc5428b94a45292261e202df1c91da5d4e971ab19ba91e7c96e0bbbb91bc

data/.github/workflows/test.yml

@@ -26,6 +26,6 @@ jobs:
     - name: Show Linux kernel version
       run: uname -r
     - name: Compile C-extension
-      run: bundle exec rake compile
+      run: POLYPHONY_USE_LIBEV=1 bundle exec rake compile
     - name: Run tests
       run:  bundle exec rake test

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.54.0
+
+- Implement Mutex#owned?, #locked? (#50)
+- Fix arity for SSLSocket#peeraddr (#55)
+- Add missing SSLServer#accept_loop method (#53)
+- Fix SSLSocket buffering behaviour
+- Add recv_loop alias for SSLSocket (#54)
+
 ## 0.53.2
 
 - Remove `splice` methods on libev backend on non-Linux OS (#43)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.53.2)
+    polyphony (0.54.0)
 
 GEM
   remote: https://rubygems.org/
@@ -17,6 +17,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     json (2.3.0)
+    localhost (1.1.8)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
@@ -72,6 +73,7 @@ DEPENDENCIES
   hiredis (= 0.6.3)
   http_parser.rb (~> 0.6.0)
   httparty (= 0.17.1)
+  localhost (~> 1.1.4)
   minitest (= 5.14.4)
   minitest-reporters (= 1.4.2)
   msgpack (= 1.4.2)

data/examples/core/queue.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+queue = Queue.new
+
+4.times { |i|
+  spin_loop {
+    job = queue.pop
+    puts("worker %d job %s" % [i, job.inspect])
+  }
+}
+
+(1..10).each do |i|
+  queue << "job#{i}"
+end
+
+sleep 0.1 until queue.empty?

data/examples/io/https_server.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'localhost/authority'
+
+authority = Localhost::Authority.fetch
+opts = {
+  reuse_addr:     true,
+  dont_linger:    true,
+  secure_context: authority.server_context
+}
+
+server = Polyphony::Net.tcp_listen('localhost', 1234, opts)
+
+puts 'Serving HTTPS on port 1234'
+
+spin_loop(interval: 1) { STDOUT << '.' }
+
+# server.accept_loop do |socket|
+while (socket = server.accept)
+  spin do
+    while (data = socket.gets("\n", 8192))
+      if data.chomp.empty?
+        socket << "HTTP/1.1 200 OK\nConnection: close\nContent-Length: 4\n\nfoo\n"
+        break
+      end
+    end
+  end
+end

data/lib/polyphony/core/sync.rb

@@ -35,6 +35,14 @@ module Polyphony
       @token = @store.shift
       @holding_fiber = Fiber.current
     end
+
+    def owned?
+      @holding_fiber == Fiber.current
+    end
+
+    def locked?
+      @holding_fiber
+    end
   end
 
   # Implements a fiber-aware ConditionVariable

data/lib/polyphony/extensions/openssl.rb

@@ -3,7 +3,7 @@
 require 'openssl'
 require_relative './socket'
 
-# Open ssl socket helper methods (to make it compatible with Socket API)
+# OpenSSL socket helper methods (to make it compatible with Socket API) and overrides
 class ::OpenSSL::SSL::SSLSocket
   alias_method :orig_initialize, :initialize
   def initialize(socket, context = nil)
@@ -23,22 +23,12 @@ class ::OpenSSL::SSL::SSLSocket
     io.reuse_addr
   end
 
-  alias_method :orig_accept, :accept
-  def accept
-    while true
-      result = accept_nonblock(exception: false)
-      case result
-      when :wait_readable then Polyphony.backend_wait_io(io, false)
-      when :wait_writable then Polyphony.backend_wait_io(io, true)
-      else
-        return result
-      end
-    end
-  end
-
-  def accept_loop
-    while true
-      yield accept
+  def fill_rbuff
+    data = self.sysread(BLOCK_SIZE)
+    if data
+      @rbuffer << data
+    else
+      @eof = true
     end
   end
 
@@ -84,4 +74,21 @@ class ::OpenSSL::SSL::SSLSocket
       yield data
     end
   end
+  alias_method :recv_loop, :read_loop
+
+  alias_method :orig_peeraddr, :peeraddr
+  def peeraddr(_ = nil)
+    orig_peeraddr
+  end
+end
+
+# OpenSSL socket helper methods (to make it compatible with Socket API) and overrides
+class ::OpenSSL::SSL::SSLServer
+  def accept_loop(ignore_errors = true)
+    loop do
+      yield accept
+    rescue SystemCallError, StandardError => e
+      raise e unless ignore_errors
+    end
+  end
 end

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'mysql2',               '0.5.3'
   s.add_development_dependency  'sequel',               '5.34.0'
   s.add_development_dependency  'httparty',             '0.17.1'
+  s.add_development_dependency  'localhost',            '~>1.1.4'
 
   # s.add_development_dependency  'jekyll',               '~>3.8.6'
   # s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'

data/test/test_sync.rb

@@ -70,4 +70,47 @@ class MutexTest < MiniTest::Test
     Fiber.current.await_all_children
     assert_equal [:bar, :foo], buf
   end
+
+  def test_owned?
+    buf = []
+    lock = Polyphony::Mutex.new
+    (1..3).each do |i|
+      spin do
+        lock.synchronize do
+          buf << ">> #{i}"
+          buf << [i, lock.owned?]
+          sleep(rand * 0.05)
+          buf << "<< #{i}"
+        end
+        buf << [i, lock.owned?]
+      end
+    end
+
+    Fiber.current.await_all_children
+    assert_equal ['>> 1', [1, true], '<< 1', [1, false], '>> 2', [2, true], '<< 2', [2, false], '>> 3', [3, true], '<< 3', [3, false]], buf
+  end
+
+  def test_locked?
+    lock = Polyphony::Mutex.new
+    a = spin do
+      sender = receive
+      lock.synchronize do
+        sender << 'pong'
+        receive
+      end
+      sender << 'pong'
+    end
+
+    snooze
+    assert !lock.locked?
+    a << Fiber.current
+    
+    receive
+    assert lock.locked?
+
+    a << Fiber.current
+    
+    receive
+    assert !lock.locked?
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.53.2
+  version: 0.54.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -226,6 +226,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.17.1
+- !ruby/object:Gem::Dependency
+  name: localhost
+  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
 description: 
 email: sharon@noteflakes.com
 executables: []
@@ -313,6 +327,7 @@ files:
 - examples/core/interrupt.rb
 - examples/core/nested.rb
 - examples/core/pingpong.rb
+- examples/core/queue.rb
 - examples/core/recurrent-timer.rb
 - examples/core/resource_delegate.rb
 - examples/core/spin.rb
@@ -336,6 +351,7 @@ files:
 - examples/io/echo_stdin.rb
 - examples/io/happy-eyeballs.rb
 - examples/io/httparty.rb
+- examples/io/https_server.rb
 - examples/io/irb.rb
 - examples/io/net-http.rb
 - examples/io/open.rb