polyphony 0.43.3 → 0.43.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f48ef7d009af377b337388a1cca2eb4fe16b85deb1f37076fcd40e010aa9c0e3
-  data.tar.gz: 7b4fa6e8951dc52fd3fdcc9b5a2f1974155e2b709d71de593657374de5020c88
+  metadata.gz: 9481b252526ebc3f8e0f5a0121eebb68492bc0c1502cfed447da7b0648e6095b
+  data.tar.gz: dfd2d5d0415833f14f9ebe2cc6336e87d0951ce86f07ebcdec0ad892f71fb74c
 SHA512:
-  metadata.gz: 8de0f7526767acef9487417efb79c528312905adc4daed2664e8781ddfffa82118812407c2632269f8c6df0ba91733723804bad027e67cd5094aa1855241d8b4
-  data.tar.gz: 94f5f80ec12f9fba315ce76495f7792125190a2e2004b455a79d58912cac523cd07f90f62218823126023a4003e4f08281676d899737f30d271d5c981f191d04
+  metadata.gz: 652633b1fc27623edb2e87b5657322ba4826ec176e8eb5131a43249e08340f793ba426743be343bfe0fce02fc60b73cb790afef816a4153585d68bdfeaa9c55d
+  data.tar.gz: 946abb7526324cae5f1d6b62e25c8410129b07ca75c82a6b7285d6269ed1911e161a6030a394ef29ba238a80da6f96787dd94fdbd5c05bd2a643379252ce80d0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.43.4 2020-07-09
+
+* Reimplement Kernel#trap
+* Dynamically allocate read buffer if length not given (#23)
+* Prevent CPU saturation on infinite sleep (#24)
+
 ## 0.43.3 2020-07-08
 
 * Fix behaviour after call to `Process.daemon` (#8)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.43.3)
+    polyphony (0.43.4)
 
 GEM
   remote: https://rubygems.org/

data/docs/getting-started/overview.md

@@ -279,7 +279,7 @@ def chat_user_handler(user_name, connection)
   while command = connection.gets
     case command
     when /^connect (.+)/
-      room&.send [:unsubscribe, message_subscriber]
+      room&.send [:subscribe, message_subscriber]
       room = CHAT_ROOMS[$1]
     when "disconnect"
       room&.send [:unsubscribe, message_subscriber]
@@ -483,4 +483,4 @@ reach version 1.0. Here are some of the exciting directions we're working on.
 - Support for more core and stdlib APIs
 - More adapters for gems with C-extensions, such as `mysql`, `sqlite3` etc
 - Use `io_uring` agent as alternative to the libev agent 
-- More concurrency constructs for building highly concurrent applications
+- More concurrency constructs for building highly concurrent applications

data/examples/performance/mem-usage.rb

@@ -4,47 +4,53 @@ def mem_usage
   `ps -o rss #{$$}`.split.last.to_i
 end
 
-def calculate_fiber_memory_cost(count)
+def calculate_memory_cost(name, count, &block)
+  GC.enable
+  ObjectSpace.garbage_collect
+  sleep 0.5
   GC.disable
   rss0 = mem_usage
-  count.times { Fiber.new { sleep 1 } }
+  count0 = ObjectSpace.count_objects[:TOTAL] - ObjectSpace.count_objects[:FREE]
+  a = []
+  count.times { a << block.call }
   rss1 = mem_usage
-  GC.start
+  count1 = ObjectSpace.count_objects[:TOTAL] - ObjectSpace.count_objects[:FREE]
+  p [count0, count1]
+  # sleep 0.5
   cost = (rss1 - rss0).to_f / count
+  count_delta = (count1 - count0) / count
 
-  puts "fiber memory cost: #{cost}KB"
+  puts "#{name} rss cost: #{cost}KB     object count: #{count_delta}"
 end
 
-calculate_fiber_memory_cost(10000)
-
-def calculate_thread_memory_cost(count)
-  GC.disable
-  rss0 = mem_usage
-  count.times { Thread.new { sleep 1 } }
-  sleep 0.5
-  rss1 = mem_usage
-  sleep 0.5
-  GC.start
-  cost = (rss1 - rss0).to_f / count
+f = Fiber.new { |f| f.transfer }
+f.transfer Fiber.current
 
-  puts "thread memory cost: #{cost}KB"
+calculate_memory_cost('fiber', 10000) do
+  f = Fiber.new { |f| f.transfer :foo }
+  f.transfer Fiber.current
+  f
 end
 
-calculate_thread_memory_cost(500)
+t = Thread.new { sleep 1}
+t.kill
+t.join
+
+calculate_memory_cost('thread', 500) do
+  t = Thread.new { sleep 1 }
+  sleep 0.001
+  t
+end
+(Thread.list - [Thread.current]).each(&:kill).each(&:join)
 
 require 'bundler/setup'
 require 'polyphony'
 
-def calculate_extended_fiber_memory_cost(count)
-  GC.disable
-  rss0 = mem_usage
-  count.times { spin { :foo } }
-  snooze
-  rss1 = mem_usage
-  GC.start
-  cost = (rss1 - rss0).to_f / count
+f = spin { sleep 0.1 }
+f.await
 
-  puts "extended fiber memory cost: #{cost}KB"
+calculate_memory_cost('polyphony fiber', 10000) do
+  f = spin { :foo }
+  f.await
+  f
 end
-
-calculate_extended_fiber_memory_cost(10000)

data/ext/polyphony/libev_agent.c

@@ -281,7 +281,8 @@ VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eo
   struct LibevAgent_t *agent;
   struct libev_io watcher;
   rb_io_t *fptr;
-  long len = NUM2INT(length);
+  long dynamic_len = length == Qnil;
+  long len = dynamic_len ? 4096 : NUM2INT(length);
   int shrinkable = io_setstrbuf(&str, len);
   char *buf = RSTRING_PTR(str);
   long total = 0;
@@ -298,8 +299,8 @@ VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eo
   
   OBJ_TAINT(str);
 
-  while (len > 0) {
-    ssize_t n = read(fptr->fd, buf, len);
+  while (1) {
+    ssize_t n = read(fptr->fd, buf, len - total);
     if (n < 0) {
       int e = errno;
       if (e != EWOULDBLOCK && e != EAGAIN) rb_syserr_fail(e, strerror(e));
@@ -312,14 +313,21 @@ VALUE LibevAgent_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eo
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
       if (n == 0) break; // EOF
-
       total = total + n;
-      buf += n;
-      len -= n;
-      if (!read_to_eof || (len == 0)) break;
+      if (!read_to_eof) break;
+
+      if (total == len) {
+        if (!dynamic_len) break;
+      
+        rb_str_resize(str, total);
+        rb_str_modify_expand(str, len);
+        buf = RSTRING_PTR(str) + total;
+        shrinkable = 0;
+        len += len;
+      }
+      else buf += n;
     }
   }
-
   if (total == 0) return Qnil;
 
   io_set_read_length(str, total, shrinkable);

data/lib/polyphony.rb

@@ -100,17 +100,9 @@ module Polyphony
       Polyphony::Process.watch(cmd, &block)
     end
 
-    def emit_signal_exception(exception, fiber = Thread.main.main_fiber)
-      Thread.current.break_out_of_ev_loop(fiber, exception)
-    end
-
-    def install_terminating_signal_handler(signal, exception_class)
-      trap(signal) { emit_signal_exception(exception_class.new) }
-    end
-
     def install_terminating_signal_handlers
-      install_terminating_signal_handler('SIGTERM', ::SystemExit)
-      install_terminating_signal_handler('SIGINT', ::Interrupt)
+      trap('SIGTERM', SystemExit)
+      trap('SIGINT', Interrupt)
     end
 
     def terminate_threads

data/lib/polyphony/core/global_api.rb

@@ -103,7 +103,7 @@ module Polyphony
 
     def sleep_forever
       Thread.current.agent.ref
-      suspend
+      loop { sleep 60 }
     ensure
       Thread.current.agent.unref
     end

data/lib/polyphony/extensions/core.rb

@@ -126,6 +126,31 @@ module ::Kernel
       break
     end
   end
+
+  alias_method :orig_trap, :trap
+  def trap(sig, command = nil, &block)
+    return orig_trap(sig, command) if command.is_a? String
+      
+    block = command if command.respond_to?(:call) && !block
+    exception = command.is_a?(Class) && command.new
+
+    # The signal trap can be invoked at any time, including while the system
+    # agent is blocking while polling for events. In order to deal with this
+    # correctly, we spin a fiber that will run the signal handler code, then
+    # call break_out_of_ev_loop, which will put the fiber at the front of the
+    # run queue, then wake up the system agent.
+    #
+    # If the command argument is an exception class however, it will be raised
+    # directly in the context of the main fiber.
+    orig_trap(sig) do
+      if exception
+        Thread.current.break_out_of_ev_loop(Thread.main.main_fiber, exception)
+      else
+        fiber = spin { snooze; block.call }
+        Thread.current.break_out_of_ev_loop(fiber, nil)
+      end
+    end
+  end
 end
 
 # Override Timeout to use cancel scope

data/lib/polyphony/extensions/io.rb

@@ -97,7 +97,7 @@ class ::IO
   # end
 
   alias_method :orig_read, :read
-  def read(len = 1 << 30)
+  def read(len = nil)
     @read_buffer ||= +''
     result = Thread.current.agent.read(self, @read_buffer, len, true)
     return nil unless result

data/lib/polyphony/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.43.3
+  version: 0.43.4
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty