polyphony 0.23 → 0.24

data/examples/performance/thread-vs-fiber/threaded_server.rb

@@ -5,7 +5,7 @@ require 'socket'
 def handle_client(client)
   Thread.new do
     parser = Http::Parser.new
-    parser.on_message_complete= proc do |env|
+    parser.on_message_complete = proc do |env|
       status_code = 200
       data = "Hello world!\n"
       headers = "Content-Length: #{data.bytesize}\r\n"

data/examples/{io/httparty_multi.rb → performance/thread-vs-fiber/xx-httparty_multi.rb}

@@ -4,28 +4,31 @@ require 'bundler/setup'
 require 'polyphony'
 require 'httparty'
 
-url = 'http://127.0.0.1:4411/?q=time'
-results = []
+URL = 'http://worldtimeapi.org/api/timezone/Europe/Paris'
+
+def get_time(results)
+  loop do
+    STDOUT << '!'
+    if (res = HTTParty.get(URL))
+      results << res
+      STDOUT << '.'
+    end
+  rescue StandardError => e
+    p e
+  end
+end
 
 t0 = Time.now
+results = []
 move_on_after(3) do
   supervise do |s|
     10.times do
-      s.spin do
-        loop do
-          STDOUT << '!'
-          if (result = HTTParty.get(url))
-            results << result
-            STDOUT << '.'
-          end
-        rescue StandardError => e
-          p e
-        end
-      end
+      s.spin { get_time(results) }
     end
   end
   puts 'done'
 end
+
 puts format(
   'got %<count>d (%<rate>0.1f reqs/s)',
   count: results.size,

data/examples/{io/httparty_threaded.rb → performance/thread-vs-fiber/xx-httparty_threaded.rb}

@@ -2,7 +2,7 @@
 
 require 'httparty'
 
-url = 'http://127.0.0.1:4411/?q=time'
+URL = 'http://worldtimeapi.org/api/timezone/Europe/Paris'
 results = Queue.new
 
 t0 = Time.now
@@ -11,7 +11,7 @@ threads = []
   threads << Thread.new do
     loop do
       STDOUT << '!'
-      if (result = HTTParty.get(url))
+      if (result = HTTParty.get(URL))
         results << result
         STDOUT << '.'
       end

data/examples/performance/thread.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+def lengthy_op
+  10.times { IO.orig_read(__FILE__) }
+end
+
+X = 1000
+
+def blocking
+  t0 = Time.now
+  data = lengthy_op
+  X.times { lengthy_op }
+  puts "read blocking (#{Time.now - t0}s)"
+end
+
+def threaded
+  t0 = Time.now
+  data = Polyphony::Thread.process { lengthy_op }
+  X.times { Polyphony::Thread.process { lengthy_op } }
+  puts "read threaded (#{Time.now - t0}s)"
+end
+
+blocking
+threaded

data/ext/gyro/extconf.rb

@@ -17,6 +17,7 @@ $defs << "-DHAVE_SYS_RESOURCE_H" if have_header("sys/resource.h")
 CONFIG["optflags"] << " -fno-strict-aliasing" unless RUBY_PLATFORM =~ /mswin/
 
 CONFIG["optflags"] << " -Wcomment"
+CONFIG["optflags"] << " -Wbitwise-op-parentheses"
 
 dir_config "gyro_ext"
 create_makefile "gyro_ext"

data/lib/polyphony/extensions/core.rb

@@ -189,8 +189,3 @@ module ::Timeout
     raise error
   end
 end
-
-trap('SIGINT') do
-  Gyro.break!
-  exit
-end

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -18,15 +18,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
-  s.executables   = ['poly']
-
-  s.add_runtime_dependency      'modulation',     '~>0.25'
-  
-  s.add_runtime_dependency      'http_parser.rb', '0.6.0'
-  s.add_runtime_dependency      'http-2',         '0.10.0'
-  s.add_runtime_dependency      'rack'
+  s.add_runtime_dependency      'modulation',         '~>1.0'
   
-  s.add_development_dependency  'hiredis',            '0.6.3'
   s.add_development_dependency  'httparty',           '0.17.0'
   s.add_development_dependency  'localhost',          '1.1.4'
   s.add_development_dependency  'minitest',           '5.11.3'
@@ -35,5 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'pg',                 '1.1.3'
   s.add_development_dependency  'rake-compiler',      '1.0.5'
   s.add_development_dependency  'redis',              '4.1.0'
-  s.add_development_dependency  'websocket',          '1.2.8'
+  s.add_development_dependency  'hiredis',            '0.6.3'
+  s.add_development_dependency  'http_parser.rb',     '~>0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.23'
+  version: '0.24'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
@@ -16,70 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
-- !ruby/object:Gem::Dependency
-  name: http_parser.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: http-2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -193,23 +137,36 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: websocket
+  name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: 
 email: ciconia@gmail.com
-executables:
-- poly
+executables: []
 extensions:
 - ext/gyro/extconf.rb
 extra_rdoc_files:
@@ -226,7 +183,6 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- bin/poly
 - docs/README.md
 - docs/getting-started/installing.md
 - docs/getting-started/tutorial.md
@@ -242,74 +198,23 @@ files:
 - examples/core/02-awaiting-coprocesses.rb
 - examples/core/03-interrupting.rb
 - examples/core/04-no-auto-run.rb
-- examples/core/cancel.rb
-- examples/core/channel_echo.rb
-- examples/core/defer.rb
-- examples/core/enumerator.rb
-- examples/core/error_bubbling.rb
-- examples/core/fiber_error.rb
-- examples/core/fiber_error_with_backtrace.rb
-- examples/core/fork.rb
-- examples/core/genserver.rb
-- examples/core/lock.rb
-- examples/core/mem-usage.rb
-- examples/core/move_on.rb
-- examples/core/move_on_twice.rb
-- examples/core/move_on_with_ensure.rb
-- examples/core/move_on_with_value.rb
-- examples/core/multiple_spin.rb
-- examples/core/nested_cancel.rb
-- examples/core/nested_multiple_spin.rb
-- examples/core/nested_spin.rb
-- examples/core/pingpong.rb
-- examples/core/pulse.rb
-- examples/core/resource.rb
-- examples/core/resource_cancel.rb
-- examples/core/resource_delegate.rb
-- examples/core/sleep.rb
-- examples/core/sleep_spin.rb
-- examples/core/snooze.rb
-- examples/core/spin_error.rb
-- examples/core/spin_error_backtrace.rb
-- examples/core/spin_uncaught_error.rb
-- examples/core/supervisor.rb
-- examples/core/supervisor_with_cancel_scope.rb
-- examples/core/supervisor_with_error.rb
-- examples/core/supervisor_with_manual_move_on.rb
-- examples/core/suspend.rb
-- examples/core/thread.rb
-- examples/core/thread_cancel.rb
-- examples/core/thread_pool.rb
-- examples/core/thread_pool_perf.rb
-- examples/core/throttle.rb
-- examples/core/timeout.rb
-- examples/core/wait_for_signal.rb
-- examples/fs/read.rb
-- examples/http/config.ru
-- examples/http/cuba.ru
-- examples/http/happy_eyeballs.rb
-- examples/http/http2_raw.rb
-- examples/http/http_client.rb
-- examples/http/http_get.rb
-- examples/http/http_parse_experiment.rb
-- examples/http/http_proxy.rb
-- examples/http/http_server.js
-- examples/http/http_server.rb
-- examples/http/http_server_forked.rb
-- examples/http/http_server_graceful.rb
-- examples/http/http_server_simple.rb
-- examples/http/http_server_throttled.rb
-- examples/http/http_ws_server.rb
-- examples/http/https_raw_client.rb
-- examples/http/https_server.rb
-- examples/http/https_wss_server.rb
-- examples/http/rack_server.rb
-- examples/http/rack_server_https.rb
-- examples/http/rack_server_https_forked.rb
-- examples/http/websocket_secure_server.rb
-- examples/http/websocket_server.rb
-- examples/http/ws_page.html
-- examples/http/wss_page.html
+- examples/core/xx-channels.rb
+- examples/core/xx-deferring-an-operation.rb
+- examples/core/xx-erlang-style-genserver.rb
+- examples/core/xx-forking.rb
+- examples/core/xx-move_on.rb
+- examples/core/xx-recurrent-timer.rb
+- examples/core/xx-resource_cancel.rb
+- examples/core/xx-resource_delegate.rb
+- examples/core/xx-signals.rb
+- examples/core/xx-sleeping.rb
+- examples/core/xx-spin_error_backtrace.rb
+- examples/core/xx-supervisors.rb
+- examples/core/xx-thread_cancel.rb
+- examples/core/xx-thread_pool.rb
+- examples/core/xx-throttling.rb
+- examples/core/xx-timeout.rb
+- examples/core/xx-using-a-mutex.rb
 - examples/interfaces/pg_client.rb
 - examples/interfaces/pg_pool.rb
 - examples/interfaces/pg_transaction.rb
@@ -317,29 +222,31 @@ files:
 - examples/interfaces/redis_client.rb
 - examples/interfaces/redis_pubsub.rb
 - examples/interfaces/redis_pubsub_perf.rb
-- examples/io/backticks.rb
-- examples/io/cat.rb
-- examples/io/echo_client.rb
-- examples/io/echo_client_from_stdin.rb
-- examples/io/echo_pipe.rb
-- examples/io/echo_server.rb
-- examples/io/echo_server_with_timeout.rb
-- examples/io/echo_stdin.rb
-- examples/io/httparty.rb
-- examples/io/httparty_multi.rb
-- examples/io/httparty_threaded.rb
-- examples/io/io_read.rb
-- examples/io/irb.rb
-- examples/io/net-http.rb
-- examples/io/open.rb
-- examples/io/system.rb
-- examples/io/tcpserver.rb
-- examples/io/tcpsocket.rb
+- examples/io/xx-backticks.rb
+- examples/io/xx-echo_client.rb
+- examples/io/xx-echo_client_from_stdin.rb
+- examples/io/xx-echo_pipe.rb
+- examples/io/xx-echo_server.rb
+- examples/io/xx-echo_server_with_timeout.rb
+- examples/io/xx-echo_stdin.rb
+- examples/io/xx-httparty.rb
+- examples/io/xx-irb.rb
+- examples/io/xx-net-http.rb
+- examples/io/xx-open.rb
+- examples/io/xx-system.rb
+- examples/io/xx-tcpserver.rb
+- examples/io/xx-tcpsocket.rb
+- examples/performance/fs_read.rb
+- examples/performance/mem-usage.rb
 - examples/performance/multi_snooze.rb
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
 - examples/performance/thread-vs-fiber/threaded_server.rb
+- examples/performance/thread-vs-fiber/xx-httparty_multi.rb
+- examples/performance/thread-vs-fiber/xx-httparty_threaded.rb
+- examples/performance/thread.rb
+- examples/performance/thread_pool_perf.rb
 - ext/gyro/async.c
 - ext/gyro/child.c
 - ext/gyro/extconf.rb
@@ -367,7 +274,6 @@ files:
 - ext/libev/ev_win32.c
 - ext/libev/ev_wrap.h
 - ext/libev/test_libev_win32.c
-- lib/ev_ext.bundle
 - lib/polyphony.rb
 - lib/polyphony/core/cancel_scope.rb
 - lib/polyphony/core/channel.rb
@@ -385,24 +291,11 @@ files:
 - lib/polyphony/extensions/openssl.rb
 - lib/polyphony/extensions/socket.rb
 - lib/polyphony/fs.rb
-- lib/polyphony/http.rb
-- lib/polyphony/http/client/agent.rb
-- lib/polyphony/http/client/http1.rb
-- lib/polyphony/http/client/http2.rb
-- lib/polyphony/http/client/response.rb
-- lib/polyphony/http/client/site_connection_manager.rb
-- lib/polyphony/http/server.rb
-- lib/polyphony/http/server/http1.rb
-- lib/polyphony/http/server/http2.rb
-- lib/polyphony/http/server/http2_stream.rb
-- lib/polyphony/http/server/rack.rb
-- lib/polyphony/http/server/request.rb
 - lib/polyphony/line_reader.rb
 - lib/polyphony/net.rb
 - lib/polyphony/postgres.rb
 - lib/polyphony/redis.rb
 - lib/polyphony/version.rb
-- lib/polyphony/websocket.rb
 - polyphony.gemspec
 - test/coverage.rb
 - test/eg.rb
@@ -413,7 +306,6 @@ files:
 - test/test_coprocess.rb
 - test/test_global_api.rb
 - test/test_gyro.rb
-- test/test_http_server.rb
 - test/test_io.rb
 - test/test_kernel.rb
 - test/test_resource_pool.rb