polyphony 0.45.0 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c8ab74213c6cc5e3852f73ee027ee496f2b04c6844e09856c9771ea5e7839a
-  data.tar.gz: 83d7c533024b6d6d633b9e18abc392911adfc07f728af826bd84cce35cafb20c
+  metadata.gz: 5f54b88851ca73f121975839812e0a1ad5686d017199b83a6365deda2b656d3a
+  data.tar.gz: 92671a26215f19e36c0b0f49edb990a6818e2c64d7a8ed8bc9c4f2621a5de170
 SHA512:
-  metadata.gz: c42e49ebcd6fb10b384438cb7688801a387963bc2a6fb2c1d3de6d022a7731a7d88db138a34b364b35c9d71830b975a69cb1f14fb277166a9db1802e24e82dec
-  data.tar.gz: 6c578eacded00dd7a77a35124c69ebc966e4f9aa42264913df82af147f43955a2ecd86087630c085fcd4d6e964aa705202c5aa24bb4032648d3ba278d60d4f63
+  metadata.gz: fd3caf340b523eccb1f86b10e06996ec26704ed1906bd82188363fb5142901b585992df8d88d0ca20adc188e51a010144fba8f10843ba79503d2984f63a08a05
+  data.tar.gz: 2b44d80a6ac0bf3f0f42ece1b7d2008c3d0b933c1df11be7f698bbc9dae80341bd1d302a1e0ccaa56b223468b607b7f024bbaa949a88ff1c343028d6cd256ba5

data/.rubocop.yml

@@ -96,6 +96,7 @@ Metrics/ModuleLength:
 Metrics/ClassLength:
   Exclude:
     - lib/polyphony/http/server/http1.rb
+    - lib/polyphony/extensions/io.rb
     - test/**/*.rb
     - examples/**/*.rb
 

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.45.1
+
+* Fix Net::HTTP compatibility
+* Fix fs adapter
+* Improve performance of IO#puts
+* Mutex#synchronize
+* Fix Socket#connect
+* Cleanup code
+* Improve support for Ruby 3 keyword args
+
 ## 0.45.0
 
 * Cleanup code

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.45.0)
+    polyphony (0.45.1)
 
 GEM
   remote: https://rubygems.org/
@@ -23,6 +23,9 @@ GEM
     forwardable-extended (2.6.0)
     hiredis (0.6.3)
     http_parser.rb (0.6.0)
+    httparty (0.17.1)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jekyll (3.8.6)
@@ -60,12 +63,16 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     method_source (1.0.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
     minitest (5.13.0)
     minitest-reporters (1.4.2)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    multi_xml (0.6.0)
     mysql2 (0.5.3)
     parallel (1.19.1)
     parser (2.7.0.2)
@@ -122,6 +129,7 @@ PLATFORMS
 DEPENDENCIES
   hiredis (= 0.6.3)
   http_parser.rb (~> 0.6.0)
+  httparty (= 0.17.1)
   jekyll (~> 3.8.6)
   jekyll-remote-theme (~> 0.4.1)
   jekyll-seo-tag (~> 2.6.1)

data/TODO.md

@@ -1,13 +1,12 @@
-0.45
-
-- Review all code
-  - Cleanup C code
-  - Cleanup and annotate examples (and remove all the examples used for
-    debugging). Focus on examples that serve as "how-to".
-
 0.45.1
 
 - Adapter for Pry and IRB (Which fixes #5 and #6)
+- Redesign signal handling - the current mechanism is problematic in that it
+  does not address signals that do not kill, for instance HUP or USR1.
+- Improve `#supervise`. It does not work as advertised, and seems to exhibit an
+  inconsistent behaviour (see supervisor example).
+- Fix backtrace for `Timeout.timeout` API (see timeout example).
+- Check why worker-thread example doesn't work.
 
 0.46.0
 

data/examples/adapters/redis_client.rb

@@ -3,7 +3,9 @@
 require 'bundler/setup'
 require 'polyphony/adapters/redis'
 
-redis = Redis.new
+::Exception.__disable_sanitized_backtrace__ = true
+
+redis = Redis.new(host: ENV['REDIS_HOST'] || 'localhost')
 
 X = 10
 

data/examples/adapters/redis_pubsub_perf.rb

@@ -6,7 +6,7 @@ require 'json'
 
 X_SESSIONS = 1000
 X_NODES = 10_000
-X_SUBSCRIPTIONS_PER_SESSION = 100
+X_SUBSCRIPTIONS_PER_SESSION = 1000
 
 $sessions = []
 X_SESSIONS.times do
@@ -17,8 +17,11 @@ X_SESSIONS.times do
   }
 end
 
+REDIS_HOST = ENV['REDIS_HOST'] || 'localhost'
+p redis_host: REDIS_HOST
+
 spin do
-  redis = Redis.new
+  redis = Redis.new(host: REDIS_HOST)
   redis.subscribe('events') do |on|
     on.message do |_, message|
       distribute_event(JSON.parse(message, symbolize_names: true))
@@ -30,18 +33,18 @@ $update_count = 0
 
 def distribute_event(event)
   $update_count += 1
-  # t0 = Time.now
+  t0 = Time.now
   count = 0
   $sessions.each do |s|
     count += 1 if s[:subscriptions].include?(event[:path])
   end
-  # elapsed = Time.now - t0
-  # rate = X_SESSIONS / elapsed
-  # puts "elapsed: #{elapsed} (#{rate}/s)" if $update_count % 100 == 0
+  elapsed = Time.now - t0
+  rate = X_SESSIONS / elapsed
+  puts "elapsed: #{elapsed} (#{rate}/s)" if $update_count % 100 == 0
 end
 
 spin do
-  redis = Redis.new
+  redis = Redis.new(host: REDIS_HOST)
   throttled_loop(1000) do
     redis.publish('events', { path: "node#{rand(X_NODES)}" }.to_json)
   end
@@ -60,7 +63,7 @@ spin do
   end
 end
 
-trap(:int) do
+trap('SIGINT') do
   puts 'bye...'
   exit!
 end

data/examples/adapters/sequel_mysql.rb

@@ -2,7 +2,7 @@
 
 require 'bundler/setup'
 require 'polyphony/adapters/sequel'
-require 'polyphony/adapters/mysql2'
+require 'polyphony/adapters/postgres'
 
 time_printer = spin do
   last = Time.now

data/examples/adapters/sequel_pg.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony/adapters/sequel'
+require 'polyphony/adapters/postgres'
+
+URL = ENV['SEQUEL_URL'] || 'postgres://localhost/test'
+
+x = 10000
+query_count = 0
+
+spin do
+  db = Sequel.connect(URL)
+  x.times { query_count += 1; db.execute('select 1 as test') }
+end
+
+spin do
+  db = Sequel.connect(URL)
+  x.times { query_count += 1; db.execute('select 2 as test') }
+end
+
+t0 = Time.now
+Fiber.current.await_all_children
+puts "query rate: #{query_count / (Time.now - t0)} reqs/s; count = #{query_count}"

data/examples/core/deferring-an-operation.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+spin do
+  puts 'two'
+  # spinning a fiber from the parent fiber allows us to schedule an operation to
+  # be performed even after the current fiber is terminated
+  Fiber.current.parent.spin { puts 'four' }
+  puts 'three'
+end
+
+puts 'one'
+
+suspend

data/examples/core/{xx-erlang-style-genserver.rb → erlang-style-genserver.rb}

@@ -3,8 +3,10 @@
 require 'bundler/setup'
 require 'polyphony'
 
-class GenServer
-  def self.start(receiver, *args)
+module GenServer
+  module_function
+
+  def start(receiver, *args)
     fiber = spin do
       state = receiver.initial_state(*args)
       loop do
@@ -14,11 +16,10 @@ class GenServer
       end
     end
     build_api(fiber, receiver)
-    snooze
     fiber
   end
 
-  def self.build_api(fiber, receiver)
+  def build_api(fiber, receiver)
     receiver.methods(false).each do |m|
       if m =~ /!$/
         fiber.define_singleton_method(m) do |*args|
@@ -32,7 +33,7 @@ class GenServer
     end
   end
 
-  def self.cast(process, method, *args)
+  def cast(process, method, *args)
     process << {
       from:   Fiber.current,
       method: method,
@@ -40,7 +41,7 @@ class GenServer
     }
   end
 
-  def self.call(process, method, *args)
+  def call(process, method, *args)
     process << {
       from:   Fiber.current,
       method: method,
@@ -50,21 +51,27 @@ class GenServer
   end
 end
 
+# In a generic server the state is not held in an instance variable but rather
+# passed as the first parameter to method calls. The return value of each method
+# is an array consisting of the result and the potentially mutated state.
 module Map
-  def self.initial_state(hash = {})
+  module_function
+
+  def initial_state(hash = {})
     hash
   end
 
-  def self.get(state, key)
+  def get(state, key)
     [state[key], state]
   end
 
-  def self.put!(state, key, value)
+  def put!(state, key, value)
     state[key] = value
     [:noreply, state]
   end
 end
 
+# start server with initial state
 map_server = GenServer.start(Map, {foo: :bar})
 
 puts 'getting value from map server'

data/examples/core/{xx-forking.rb → forking.rb}

@@ -20,5 +20,5 @@ end
 puts "got child pid #{pid}"
 
 puts 'parent waiting for child'
-Gyro::Child.new(pid).await
+Thread.current.backend.waitpid(pid)
 puts 'parent done waiting'

data/examples/core/handling-signals.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+puts "going to sleep (press Ctrl-C to stop)"
+begin
+  sleep
+ensure
+  puts "done sleeping"
+end

data/examples/core/{xx-pingpong.rb → pingpong.rb}

@@ -9,10 +9,12 @@ pong = spin_loop do
   ping << 'pong'
 end
 
-ping = spin_loop do
-  pong << ['ping', Fiber.current]
-  msg = receive
-  puts msg
+ping = spin do
+  3.times do
+    pong << ['ping', Fiber.current]
+    msg = receive
+    puts msg
+  end
 end
 
-suspend
+ping.await

data/examples/core/{xx-recurrent-timer.rb → recurrent-timer.rb}

@@ -3,7 +3,7 @@
 require 'bundler/setup'
 require 'polyphony'
 
-move_on_after(3) do
+move_on_after(3.1) do
   puts 'Start...'
   every(1) do
     puts Time.now

data/examples/core/{xx-resource_delegate.rb → resource_delegate.rb}

@@ -10,7 +10,7 @@ class Number
 
   def greet(other)
     puts "You are number #{other}, I am number #{@id}"
-    sleep(0.05 + rand * 0.2)
+    sleep rand(0.2..0.3)
   end
 end
 
@@ -25,7 +25,6 @@ def meet(number)
   end
 end
 
-3.times { |x| spin { meet(x) } }
+(4..10).each { |x| spin { meet(x) } }
 
-t0 = Time.now
-every(10) { puts "uptime: #{Time.now - t0}" }
+sleep 1

data/examples/core/{01-spinning-up-fibers.rb → spin.rb}

@@ -14,5 +14,5 @@ end
 spin { nap(:a, 1) }
 spin { nap(:b, 2) }
 
-# Calling suspend will block until all child fibers have terminated
+# Calling suspend will block until no work is left to do
 suspend

data/examples/core/{xx-spin_error_backtrace.rb → spin_error_backtrace.rb}

@@ -9,7 +9,7 @@ end
 
 def deferred_error(t)
   puts "deferred_error"
-  spin { de2(t) }
+  spin { de2(t) }.await
 end
 
 def de2(t)

data/examples/core/{xx-supervise-process.rb → supervise-process.rb}

@@ -8,7 +8,7 @@ Exception.__disable_sanitized_backtrace__ = true
 supervisor = spin do
   puts "parent pid #{Process.pid}"
 
-  Polyphony::ProcessSupervisor.supervise do
+  Polyphony.watch_process do
     puts "child pid #{Process.pid}"
     puts "go to sleep"
     sleep 5
@@ -22,9 +22,12 @@ supervisor = spin do
 end
 
 begin
+  spin do
+    sleep 2.5
+    Process.kill('TERM', Process.pid)
+  end
+  supervisor.await
+rescue SystemExit
+  supervisor.terminate
   supervisor.await
-rescue Interrupt
-  exit!
-  # supervisor.terminate
-  # supervisor.await
 end

data/examples/core/supervisor.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+def my_sleep(t)
+  puts "#{t} start"
+  sleep(t)
+  puts "#{t} done"
+end
+
+spin { my_sleep(1) }
+spin { my_sleep(2) }
+spin { my_sleep(3) }
+spin { puts "fiber count: #{Fiber.current.children.count}" }
+snooze
+
+puts "#{Time.now} supervising..."
+supervise
+puts "#{Time.now} done supervising"

data/examples/core/{xx-worker-thread.rb → worker-thread.rb}

@@ -5,9 +5,9 @@ require 'polyphony'
 
 def do_work(client)
   result = yield
-  client.schedule(result)
+  client << result
 rescue Exception => e
-  client.schedule(e)
+  client << e
 end
 
 $worker = Thread.new do