polyphony 0.36 → 0.38

data/lib/polyphony/extensions/openssl.rb

@@ -2,7 +2,7 @@
 
 require 'openssl'
 
-import('./socket')
+require_relative './socket'
 
 # Open ssl socket helper methods (to make it compatible with Socket API)
 class ::OpenSSL::SSL::SSLSocket

data/lib/polyphony/extensions/socket.rb

@@ -2,7 +2,8 @@
 
 require 'socket'
 
-import('./io')
+require_relative './io'
+require_relative '../core/thread_pool'
 
 # Socket overrides (eventually rewritten in C)
 class ::Socket

data/lib/polyphony/extensions/thread.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Exceptions = import '../core/exceptions'
+require_relative '../core/exceptions'
 
 # Thread extensions
 class ::Thread
@@ -19,7 +19,7 @@ class ::Thread
     setup
     @ready = true
     result = @block.(*@args)
-  rescue Exceptions::MoveOn, Exceptions::Terminate => e
+  rescue Polyphony::MoveOn, Polyphony::Terminate => e
     result = e.value
   rescue Exception => e
     result = e
@@ -78,7 +78,7 @@ class ::Thread
 
   alias_method :orig_kill, :kill
   def kill
-    raise Exceptions::Terminate
+    raise Polyphony::Terminate
   end
 
   alias_method :orig_inspect, :inspect

data/lib/polyphony/net.rb

@@ -1,73 +1,77 @@
 # frozen_string_literal: true
 
-export  :tcp_connect,
-        :tcp_listen
+require_relative './extensions/socket'
+require_relative './extensions/openssl'
 
-import('./extensions/socket')
-import('./extensions/openssl')
-
-def tcp_connect(host, port, opts = {})
-  socket = ::Socket.new(:INET, :STREAM).tap do |s|
-    addr = ::Socket.sockaddr_in(port, host)
-    s.connect(addr)
-  end
-  if opts[:secure_context] || opts[:secure]
-    secure_socket(socket, opts[:secure_context], opts.merge(host: host))
-  else
-    socket
-  end
-end
-
-def tcp_listen(host = nil, port = nil, opts = {})
-  host ||= '0.0.0.0'
-  raise 'Port number not specified' unless port
-
-  socket = socket_from_options(host, port, opts)
-  if opts[:secure_context] || opts[:secure]
-    secure_server(socket, opts[:secure_context], opts)
-  else
-    socket
-  end
-end
-
-def socket_from_options(host, port, opts)
-  ::Socket.new(:INET, :STREAM).tap do |s|
-    s.reuse_addr if opts[:reuse_addr]
-    s.dont_linger if opts[:dont_linger]
-    addr = ::Socket.sockaddr_in(port, host)
-    s.bind(addr)
-    s.listen(0)
-  end
-end
-
-def secure_socket(socket, context, opts)
-  context ||= OpenSSL::SSL::SSLContext.new
-  setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
-  socket = secure_socket_wrapper(socket, context)
-
-  socket.tap do |s|
-    s.hostname = opts[:host] if opts[:host]
-    s.connect
-    s.post_connection_check(opts[:host]) if opts[:host]
-  end
-end
-
-def secure_socket_wrapper(socket, context)
-  if context
-    OpenSSL::SSL::SSLSocket.new(socket, context)
-  else
-    OpenSSL::SSL::SSLSocket.new(socket)
+module Polyphony
+  module Net
+    class << self
+      def tcp_connect(host, port, opts = {})
+        socket = ::Socket.new(:INET, :STREAM).tap do |s|
+          addr = ::Socket.sockaddr_in(port, host)
+          s.connect(addr)
+        end
+        if opts[:secure_context] || opts[:secure]
+          secure_socket(socket, opts[:secure_context], opts.merge(host: host))
+        else
+          socket
+        end
+      end
+      
+      def tcp_listen(host = nil, port = nil, opts = {})
+        host ||= '0.0.0.0'
+        raise 'Port number not specified' unless port
+      
+        socket = socket_from_options(host, port, opts)
+        if opts[:secure_context] || opts[:secure]
+          secure_server(socket, opts[:secure_context], opts)
+        else
+          socket
+        end
+      end
+      
+      def socket_from_options(host, port, opts)
+        ::Socket.new(:INET, :STREAM).tap do |s|
+          s.reuse_addr if opts[:reuse_addr]
+          s.dont_linger if opts[:dont_linger]
+          addr = ::Socket.sockaddr_in(port, host)
+          s.bind(addr)
+          s.listen(0)
+        end
+      end
+      
+      def secure_socket(socket, context, opts)
+        context ||= OpenSSL::SSL::SSLContext.new
+        setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
+        socket = secure_socket_wrapper(socket, context)
+      
+        socket.tap do |s|
+          s.hostname = opts[:host] if opts[:host]
+          s.connect
+          s.post_connection_check(opts[:host]) if opts[:host]
+        end
+      end
+      
+      def secure_socket_wrapper(socket, context)
+        if context
+          OpenSSL::SSL::SSLSocket.new(socket, context)
+        else
+          OpenSSL::SSL::SSLSocket.new(socket)
+        end
+      end
+      
+      def secure_server(socket, context, opts)
+        setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
+        OpenSSL::SSL::SSLServer.new(socket, context)
+      end
+      
+      def setup_alpn(context, protocols)
+        context.alpn_protocols = protocols
+        context.alpn_select_cb = lambda do |peer_protocols|
+          (protocols & peer_protocols).first
+        end
+      end
+    end
   end
 end
 
-def secure_server(socket, context, opts)
-  setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
-  OpenSSL::SSL::SSLServer.new(socket, context)
-end
-
-def setup_alpn(context, protocols)
-  context.alpn_protocols = protocols
-  context.alpn_select_cb = lambda do |peer_protocols|
-    (protocols & peer_protocols).first
-  end
-end

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
-  s.add_runtime_dependency      'modulation',           '~>1.0'
-  
   s.add_development_dependency  'httparty',             '0.17.0'
   s.add_development_dependency  'localhost',            '1.1.4'
   s.add_development_dependency  'minitest',             '5.13.0'
@@ -39,5 +37,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'
   s.add_development_dependency  'jekyll-seo-tag',       '~>2.6.1'
   s.add_development_dependency  'just-the-docs',        '~>0.2.7'
-
 end

data/test/stress.rb

@@ -1,20 +1,25 @@
 # frozen_string_literal: true
 
-@count = 0
+count = ARGV[0] ? ARGV[0].to_i : 100
 
-def run_tests
-  @count += 1
-  puts "!(#{@count})"
-  # output = `ruby test/test_thread.rb -n test_thread_inspect`
-  system('ruby test/run.rb')
+TEST_CMD = 'ruby test/run.rb'
+
+def run_test(count)
+  puts "#{count}: running tests..."
+  system(TEST_CMD)
   return if $?.exitstatus == 0
 
+  puts "Failure after #{count} tests"
   exit!
-  # puts
-  # puts output
-  # exit!
 end
 
-loop {
-  run_tests
-}
+trap('INT') { exit! }
+t0 = Time.now
+count.times { |i| run_test(i + 1) }
+elapsed = Time.now - t0
+puts format(
+  "Successfully ran %d tests in %f seconds (%f per test)",
+  count,
+  elapsed,
+  elapsed / count
+)

data/test/test_thread.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
+require 'polyphony/adapters/trace'
 
 class ThreadTest < MiniTest::Test
   def test_thread_spin

data/test/test_thread_pool.rb

@@ -25,7 +25,7 @@ class ThreadPoolTest < MiniTest::Test
     threads = []
     results = []
 
-    10.times do |i|
+    15.times do |i|
       spin do
         results << @pool.process do
           threads << Thread.current
@@ -38,7 +38,7 @@ class ThreadPoolTest < MiniTest::Test
     suspend
 
     assert_equal @pool.size, threads.uniq.size
-    assert_equal (0..9).map { |i| i * 10}, results.sort
+    assert_equal (0..14).map { |i| i * 10}, results.sort
   end
 
   def test_process_with_exception

data/test/test_throttler.rb

@@ -24,7 +24,6 @@ class ThrottlerTest < MiniTest::Test
     end
     sleep 0.25
     f.stop
-    puts "count: #{buffer.size}"
     assert (2..6).include?(buffer.size)
   ensure
     t.stop

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.36'
+  version: '0.38'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: modulation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +304,7 @@ files:
 - examples/core/xx-deferring-an-operation.rb
 - examples/core/xx-erlang-style-genserver.rb
 - examples/core/xx-exception-backtrace.rb
+- examples/core/xx-fork-cleanup.rb
 - examples/core/xx-fork-spin.rb
 - examples/core/xx-fork-terminate.rb
 - examples/core/xx-forking.rb