polyphony 0.45.0 → 0.45.1

data/ext/polyphony/polyphony.c

@@ -9,7 +9,6 @@ ID ID_each;
 ID ID_inspect;
 ID ID_invoke;
 ID ID_new;
-ID ID_raise;
 ID ID_ivar_running;
 ID ID_ivar_thread;
 ID ID_runnable;
@@ -65,7 +64,6 @@ void Init_Polyphony() {
   ID_ivar_running   = rb_intern("@running");
   ID_ivar_thread    = rb_intern("@thread");
   ID_new            = rb_intern("new");
-  ID_raise          = rb_intern("raise");
   ID_runnable       = rb_intern("runnable");
   ID_runnable_value = rb_intern("runnable_value");
   ID_signal         = rb_intern("signal");

data/ext/polyphony/polyphony.h

@@ -24,7 +24,6 @@
   return RAISE_EXCEPTION(ret); \
 }
 
-
 extern backend_interface_t backend_interface;
 #define __BACKEND__ (backend_interface)
 
@@ -67,12 +66,6 @@ enum {
   FIBER_STATE_SCHEDULED     = 2
 };
 
-// watcher flags
-enum {
-  // a watcher's active field will be set to this after fork
-  GYRO_WATCHER_POST_FORK = 0xFF
-};
-
 VALUE Fiber_auto_watcher(VALUE self);
 void Fiber_make_runnable(VALUE fiber, VALUE value);
 
@@ -85,13 +78,7 @@ VALUE Queue_delete(VALUE self, VALUE value);
 long Queue_len(VALUE self);
 void Queue_trace(VALUE self);
 
-VALUE Polyphony_snooze(VALUE self);
-
 VALUE Thread_schedule_fiber(VALUE thread, VALUE fiber, VALUE value);
 VALUE Thread_switch_fiber(VALUE thread);
 
-int io_setstrbuf(VALUE *str, long len);
-void io_set_read_length(VALUE str, long n, int shrinkable);
-VALUE io_enc_str(VALUE str, rb_io_t *fptr);
-
 #endif /* POLYPHONY_H */

data/ext/polyphony/polyphony_ext.c

@@ -12,12 +12,11 @@ void Init_polyphony_ext() {
   ev_set_allocator(xrealloc);
 
   Init_Polyphony();
+
   Init_LibevBackend();
   Init_Queue();
   Init_Event();
-
   Init_Fiber();
   Init_Thread();
-
   Init_Tracing();
 }

data/ext/polyphony/queue.c

@@ -85,12 +85,11 @@ VALUE Queue_shift(VALUE self) {
   while (1) {
     ring_buffer_push(&queue->shift_queue, fiber);
     if (queue->values.count > 0) Fiber_make_runnable(fiber, Qnil);
-    
+
     VALUE switchpoint_result = __BACKEND__.wait_event(backend, Qnil);
     ring_buffer_delete(&queue->shift_queue, fiber);
 
-    if (RTEST(rb_obj_is_kind_of(switchpoint_result, rb_eException)))
-      return rb_funcall(rb_mKernel, ID_raise, 1, switchpoint_result);
+    TEST_RESUME_EXCEPTION(switchpoint_result);
     RB_GC_GUARD(switchpoint_result);
 
     if (queue->values.count > 0)
@@ -152,7 +151,7 @@ VALUE Queue_flush_waiters(VALUE self, VALUE value) {
   while(1) {
     VALUE fiber = ring_buffer_shift(&queue->shift_queue);
     if (fiber == Qnil) return self;
-    
+
     Fiber_make_runnable(fiber, value);
   }
 }

data/ext/polyphony/ring_buffer.c

@@ -24,7 +24,6 @@ VALUE ring_buffer_shift(ring_buffer *buffer) {
   value = buffer->entries[buffer->head];
   buffer->head = (buffer->head + 1) % buffer->size;
   buffer->count--;
-  // INSPECT(value);
   return value;
 }
 

data/ext/polyphony/thread.c

@@ -12,7 +12,7 @@ ID ID_stop;
 
 static VALUE Thread_setup_fiber_scheduling(VALUE self) {
   VALUE queue = rb_funcall(cQueue, ID_new, 0);
-  
+
   rb_ivar_set(self, ID_ivar_main_fiber, rb_fiber_current());
   rb_ivar_set(self, ID_run_queue, queue);
 
@@ -133,8 +133,7 @@ VALUE Thread_switch_fiber(VALUE self) {
     next_fiber = Queue_shift_no_wait(queue);
     if (next_fiber != Qnil) {
       if (backend_was_polled == 0 && ref_count > 0) {
-        // this mechanism prevents event starvation in case the run queue never
-        // empties
+        // this prevents event starvation in case the run queue never empties
         __BACKEND__.poll(backend, Qtrue, current_fiber, queue);
       }
       break;
@@ -154,7 +153,7 @@ VALUE Thread_switch_fiber(VALUE self) {
   rb_ivar_set(next_fiber, ID_runnable, Qnil);
   RB_GC_GUARD(next_fiber);
   RB_GC_GUARD(value);
-  return (next_fiber == current_fiber) ? 
+  return (next_fiber == current_fiber) ?
     value : rb_funcall(next_fiber, ID_transfer, 1, value);
 }
 

data/lib/polyphony/adapters/fs.rb

@@ -2,7 +2,7 @@
 
 require 'fileutils'
 
-require_relative './core/thread_pool'
+require_relative '../core/thread_pool'
 
 ::File.singleton_class.instance_eval do
   alias_method :orig_stat, :stat

data/lib/polyphony/adapters/redis.rb

@@ -56,7 +56,7 @@ class Polyphony::RedisDriver
     reply = @reader.gets
     return reply if reply
 
-    while (data = @connection.readpartial(8192))
+    @connection.read_loop do |data|
       @reader.feed(data)
       reply = @reader.gets
       return reply unless reply == false

data/lib/polyphony/core/global_api.rb

@@ -113,10 +113,10 @@ module Polyphony
       Thread.current.backend.unref
     end
 
-    def throttled_loop(rate, count: nil, &block)
-      throttler = Polyphony::Throttler.new(rate)
-      if count
-        count.times { |_i| throttler.(&block) }
+    def throttled_loop(rate = nil, **opts, &block)
+      throttler = Polyphony::Throttler.new(rate || opts)
+      if opts[:count]
+        opts[:count].times { |_i| throttler.(&block) }
       else
         loop { throttler.(&block) }
       end

data/lib/polyphony/core/sync.rb

@@ -8,17 +8,19 @@ module Polyphony
       @store << :token
     end
 
-    def synchronize
+    def synchronize(&block)
       return yield if @holding_fiber == Fiber.current
 
-      begin
-        @token = @store.shift
-        @holding_fiber = Fiber.current
-        yield
-      ensure
-        @holding_fiber = nil
-        @store << @token if @token
-      end
+      synchronize_not_holding(&block)
+    end
+
+    def synchronize_not_holding
+      @token = @store.shift
+      @holding_fiber = Fiber.current
+      yield
+    ensure
+      @holding_fiber = nil
+      @store << @token if @token
     end
 
     def conditional_release

data/lib/polyphony/extensions/core.rb

@@ -141,12 +141,7 @@ module ::Kernel
   end
 
   def pipe_to_eof(src, dest)
-    loop do
-      data = src.readpartial(8192)
-      dest << data
-    rescue EOFError
-      break
-    end
+    src.read_loop { |data| dest << data }
   end
 
   alias_method :orig_trap, :trap

data/lib/polyphony/extensions/io.rb

@@ -163,19 +163,29 @@ class ::IO
   # def putc(obj)
   # end
 
+  LINEFEED = "\n"
+  LINEFEED_RE = /\n$/.freeze
+
   alias_method :orig_puts, :puts
   def puts(*args)
     if args.empty?
-      write "\n"
+      write LINEFEED
       return
     end
 
-    strs = args.each_with_object([]) do |a, m|
-      a = a.to_s
-      m << a
-      m << "\n" unless a =~ /\n$/
+    idx = 0
+    while idx < args.size
+      arg = args[idx]
+      args[idx] = arg = arg.to_s unless arg.is_a?(String)
+      if arg =~ LINEFEED_RE
+        idx += 1
+      else
+        args.insert(idx + 1, LINEFEED)
+        idx += 2
+      end
     end
-    write(*strs)
+
+    write(*args)
     nil
   end
 
@@ -217,4 +227,28 @@ class ::IO
   #   end
   #   outbuf
   # end
+
+  def wait_readable(timeout = nil)
+    if timeout
+      move_on_after(timeout) do
+        Thread.current.backend.wait_io(self, false)
+        self
+      end
+    else
+      Thread.current.backend.wait_io(self, false)
+      self
+    end
+  end
+
+  def wait_writable(timeout = nil)
+    if timeout
+      move_on_after(timeout) do
+        Thread.current.backend.wait_io(self, true)
+        self
+      end
+    else
+      Thread.current.backend.wait_io(self, true)
+      self
+    end
+  end
 end

data/lib/polyphony/extensions/socket.rb

@@ -13,8 +13,9 @@ class ::Socket
 
   NO_EXCEPTION = { exception: false }.freeze
 
-  def connect(remotesockaddr)
-    Thread.current.backend.connect(self, remotesockaddr.ip_address, remotesockaddr.ip_port)
+  def connect(addr)
+    addr = Addrinfo.new(addr) if addr.is_a?(String)
+    Thread.current.backend.connect(self, addr.ip_address, addr.ip_port)
   end
 
   def recv(maxlen, flags = 0, outbuf = nil)
@@ -118,6 +119,14 @@ class ::TCPSocket
   def reuse_port
     setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEPORT, 1)
   end
+
+  def read_nonblock(len, str = nil, exception: true)
+    @io.read_nonblock(len, str, exception: exception)
+  end
+
+  def write_nonblock(buf, exception: true)
+    @io.write_nonblock(buf, exception: exception)
+  end
 end
 
 # Override stock TCPServer code by encapsulating a Socket instance.

data/lib/polyphony/version.rb

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

data/polyphony.gemspec

@@ -32,9 +32,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency  'redis',                '4.1.0'
   s.add_development_dependency  'hiredis',              '0.6.3'
   s.add_development_dependency  'http_parser.rb',       '~>0.6.0'
-  s.add_development_dependency  'rack',               '>=2.0.8', '<2.3.0'
+  s.add_development_dependency  'rack',                 '>=2.0.8', '<2.3.0'
   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  'jekyll',               '~>3.8.6'
   s.add_development_dependency  'jekyll-remote-theme',  '~>0.4.1'

data/test/test_io.rb

@@ -246,4 +246,20 @@ class IOClassMethodsTest < MiniTest::Test
     assert_equal 1e6, s.bytesize
     assert s == IO.orig_read(fn)
   end
+
+  def pipe_read
+    i, o = IO.pipe
+    yield o
+    o.close
+    i.read
+  ensure
+    i.close
+  end
+
+  def test_puts
+    assert_equal "foo\n", pipe_read { |f| f.puts 'foo' }
+    assert_equal "foo\n", pipe_read { |f| f.puts "foo\n" }
+    assert_equal "foo\nbar\n", pipe_read { |f| f.puts 'foo', 'bar' }
+    assert_equal "foo\nbar\n", pipe_read { |f| f.puts 'foo', "bar\n" }
+  end
 end

data/test/test_socket.rb

@@ -32,3 +32,20 @@ class SocketTest < MiniTest::Test
     server&.close
   end
 end
+
+class HTTPClientTest < MiniTest::Test
+  require 'httparty'
+  require 'json'
+
+  def test_http
+    res = HTTParty.get('http://worldtimeapi.org/api/timezone/Europe/Paris')
+    response = JSON.load(res.body)
+    assert_equal "CEST", response['abbreviation']
+  end
+
+  def test_https
+    res = HTTParty.get('https://worldtimeapi.org/api/timezone/Europe/Paris')
+    response = JSON.load(res.body)
+    assert_equal "CEST", response['abbreviation']
+  end
+end

data/test/test_throttler.rb

@@ -12,6 +12,7 @@ class ThrottlerTest < MiniTest::Test
     f.stop
     elapsed = Time.now - t0
     expected = (elapsed * 10).to_i
+    STDOUT.orig_write "xxxxxxxx #{[elapsed, expected].inspect}\n"
     assert buffer.size >= expected - 1 && buffer.size <= expected + 1
   ensure
     t.stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.45.1
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -198,6 +198,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.34.0
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +331,6 @@ files:
 - docs/main-concepts/fiber-scheduling.md
 - docs/main-concepts/index.md
 - docs/polyphony-logo.png
-- examples/adapters/concurrent-ruby.rb
 - examples/adapters/pg_client.rb
 - examples/adapters/pg_notify.rb
 - examples/adapters/pg_pool.rb
@@ -329,70 +342,46 @@ files:
 - examples/adapters/redis_pubsub_perf.rb
 - examples/adapters/sequel_mysql.rb
 - examples/adapters/sequel_mysql_pool.rb
-- examples/core/01-spinning-up-fibers.rb
-- examples/core/02-awaiting-fibers.rb
-- examples/core/03-interrupting.rb
-- examples/core/04-handling-signals.rb
-- examples/core/xx-at_exit.rb
-- examples/core/xx-backend.rb
-- examples/core/xx-caller.rb
-- examples/core/xx-channels.rb
-- examples/core/xx-daemon.rb
-- examples/core/xx-deadlock.rb
-- 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
-- examples/core/xx-move_on.rb
-- examples/core/xx-pingpong.rb
-- examples/core/xx-queue-async.rb
-- examples/core/xx-readpartial.rb
-- examples/core/xx-recurrent-timer.rb
-- examples/core/xx-resource_delegate.rb
-- examples/core/xx-signals.rb
-- examples/core/xx-sleep-forever.rb
-- examples/core/xx-sleeping.rb
-- examples/core/xx-snooze-starve.rb
-- examples/core/xx-spin-fork.rb
-- examples/core/xx-spin_error_backtrace.rb
-- examples/core/xx-state-machine.rb
-- examples/core/xx-stop.rb
-- examples/core/xx-supervise-process.rb
-- examples/core/xx-supervisors.rb
-- examples/core/xx-thread-selector-sleep.rb
-- examples/core/xx-thread-selector-snooze.rb
-- examples/core/xx-thread-sleep.rb
-- examples/core/xx-thread-snooze.rb
-- examples/core/xx-thread_pool.rb
-- examples/core/xx-throttling.rb
-- examples/core/xx-timeout.rb
-- examples/core/xx-timer-gc.rb
-- examples/core/xx-trace.rb
-- examples/core/xx-using-a-mutex.rb
-- examples/core/xx-worker-thread.rb
+- examples/adapters/sequel_pg.rb
+- examples/core/await.rb
+- examples/core/channels.rb
+- examples/core/deferring-an-operation.rb
+- examples/core/erlang-style-genserver.rb
+- examples/core/forking.rb
+- examples/core/handling-signals.rb
+- examples/core/interrupt.rb
+- examples/core/pingpong.rb
+- examples/core/recurrent-timer.rb
+- examples/core/resource_delegate.rb
+- examples/core/spin.rb
+- examples/core/spin_error_backtrace.rb
+- examples/core/supervise-process.rb
+- examples/core/supervisor.rb
+- examples/core/thread-sleep.rb
+- examples/core/thread_pool.rb
+- examples/core/throttling.rb
+- examples/core/timeout.rb
+- examples/core/using-a-mutex.rb
+- examples/core/worker-thread.rb
+- examples/io/backticks.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/happy-eyeballs.rb
+- examples/io/httparty.rb
+- examples/io/irb.rb
+- examples/io/net-http.rb
+- examples/io/open.rb
+- examples/io/pry.rb
+- examples/io/rack_server.rb
+- examples/io/system.rb
+- examples/io/tcpserver.rb
+- examples/io/tcpsocket.rb
 - examples/io/tunnel.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-happy-eyeballs.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-pry.rb
-- examples/io/xx-rack_server.rb
-- examples/io/xx-switch.rb
-- examples/io/xx-system.rb
-- examples/io/xx-tcpserver.rb
-- examples/io/xx-tcpsocket.rb
-- examples/io/xx-zip.rb
+- examples/io/zip.rb
 - examples/performance/fiber_transfer.rb
 - examples/performance/fs_read.rb
 - examples/performance/mem-usage.rb
@@ -400,17 +389,14 @@ files:
 - examples/performance/multi_snooze.rb
 - examples/performance/snooze.rb
 - examples/performance/snooze_raw.rb
+- examples/performance/switch.rb
+- examples/performance/thread-vs-fiber/httparty_multi.rb
+- examples/performance/thread-vs-fiber/httparty_threaded.rb
 - examples/performance/thread-vs-fiber/polyphony_mt_server.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
 - examples/performance/thread-vs-fiber/polyphony_server_read_loop.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_pool_perf.rb
-- examples/performance/xx-array.rb
-- examples/performance/xx-fiber-switch.rb
-- examples/performance/xx-snooze.rb
-- examples/xx-spin.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README