polyphony 0.16 → 0.17

data/lib/polyphony/core/coprocess.rb

@@ -82,6 +82,7 @@ class Coprocess
       suspend
     end
   end
+  alias_method :join, :await
 
   def when_done(&block)
     @when_done = block

data/lib/polyphony/core/supervisor.rb

@@ -41,7 +41,7 @@ class Supervisor
   end
 
   def spawn_proc(proc)
-    @coprocesses << Object.spawn do |coprocess|
+    @coprocesses << coproc do |coprocess|
       proc.call(coprocess)
       task_completed(coprocess)
     rescue Exception => e

data/lib/polyphony/extensions/io.rb

@@ -1,17 +1,62 @@
 # frozen_string_literal: true
 
 class ::IO
-  def read_watcher
-    @read_watcher ||= EV::IO.new(self, :r)
-  end
-
-  def write_watcher
-    @write_watcher ||= EV::IO.new(self, :w)
-  end
-
-  def stop_watchers
-    @read_watcher&.stop
-    @write_watcher&.stop
+  class << self
+    alias_method :orig_binread, :binread
+    def binread(name, length = nil, offset = nil)
+      File.open(name, 'rb:ASCII-8BIT') do |f|
+        f.seek(offset) if offset
+        length ? f.read(length) : f.read
+      end
+    end
+
+    alias_method :orig_binwrite, :binwrite
+    def binwrite(name, string, offset = nil)
+      File.open(name, 'wb:ASCII-8BIT') do |f|
+        f.seek(offset) if offset
+        f.write(string)
+      end
+    end
+
+    EMPTY_HASH = {}
+
+    alias_method :orig_foreach, :foreach
+    def foreach(name, sep = $/, limit = nil, getline_args = EMPTY_HASH, &block)
+      sep, limit = $/, sep if sep.is_a?(Integer)
+      File.open(name, 'r') do |f|
+        f.each_line(sep, limit, getline_args, &block)
+      end
+    end
+
+    alias_method :orig_read, :read
+    def read(name, length = nil, offset = nil, opt = EMPTY_HASH)
+      File.open(name, opt[:mode] || 'r') do |f|
+        f.seek(offset) if offset
+        length ? f.read(length) : f.read
+      end
+    end
+
+    alias_method :orig_readlines, :readlines
+    def readlines(name, sep = $/, limit = nil, getline_args = EMPTY_HASH)
+      File.open(name, 'r') do |f|
+        f.readlines(sep, limit, getline_args)
+      end
+    end
+
+    alias_method :orig_write, :write
+    def write(name, string, offset = nil, opt = EMPTY_HASH)
+      File.open(name, opt[:mode] || 'w') do |f|
+        f.seek(offset) if offset
+        f.write(string)
+      end
+    end
+
+    alias_method :orig_popen, :popen
+    def popen(*args)
+      Open3.popen2(*args) do |i, o, t|
+        yield o
+      end
+    end
   end
 
   # def each(sep = $/, limit = nil, chomp: nil)
@@ -34,9 +79,28 @@ class ::IO
   # def getc
   # end
 
-  # def gets(sep = $/, limit = nil, chomp: nil)
-  #   sep, limit = $/, sep if sep.is_a?(Integer)
-  # end
+  alias_method :orig_gets, :gets
+  def gets(sep = $/, limit = nil, chomp: nil)
+    sep, limit = $/, sep if sep.is_a?(Integer)
+    sep_size = sep.bytesize
+
+    @gets_buffer ||= +''
+
+    loop do
+      idx = @gets_buffer.index(sep)
+      return @gets_buffer.slice!(0, idx + sep_size) if idx
+
+      data = readpartial(8192)
+      if data
+        @gets_buffer << data
+      else
+        return nil if @gets_buffer.empty?
+        line, @gets_buffer = @gets_buffer.freeze, +''
+        return line
+      end
+    end
+    # orig_gets(sep, limit, chomp: chomp)
+  end
 
   # def print(*args)
   # end
@@ -47,8 +111,24 @@ class ::IO
   # def putc(obj)
   # end
 
-  # def puts(*args)
-  # end
+  alias_method :orig_puts, :puts
+  def puts(*args)
+    if args.empty?
+      write "\n"
+      return
+    end
+
+    s = args.each_with_object(+'') do |a, str|
+      if a.is_a?(Array)
+        a.each { |a2| str << a2.to_s << "\n" }
+      else
+        a = a.to_s
+        str << a
+        str << "\n" unless a =~ /\n$/
+      end
+    end
+    write s
+  end
 
   # def readbyte
   # end
@@ -61,4 +141,4 @@ class ::IO
 
   # def readlines(sep = $/, limit = nil, chomp: nil)
   # end
-end
+end

data/lib/polyphony/extensions/kernel.rb

@@ -35,6 +35,35 @@ class ::Exception
   end
 end
 
+class Pulser
+  def initialize(freq)
+    fiber = Fiber.current
+    @timer = EV::Timer.new(freq, freq)
+    @timer.start { fiber.transfer freq }
+  end
+
+  def await
+    suspend
+  rescue Exception => e
+    @timer.stop
+    raise e
+  end
+
+  def stop
+    @timer.stop
+  end
+end
+
+module ::Process
+  def self.detach(pid)
+    coproc {
+      EV::Child.new(pid).await
+    }
+  end
+end
+
+require 'open3'
+
 # Kernel extensions (methods available to all objects)
 module ::Kernel
   def after(duration, &block)
@@ -64,6 +93,14 @@ module ::Kernel
     CancelScope.new(timeout: duration, mode: :cancel).(&block)
   end
 
+  def coproc(proc = nil, &block)
+    if proc.is_a?(Coprocess)
+      proc.run
+    else
+      Coprocess.new(&(block || proc)).run
+    end
+  end
+
   def every(freq, &block)
     EV::Timer.new(freq, freq).start(&block)
   end
@@ -72,25 +109,6 @@ module ::Kernel
     CancelScope.new(timeout: duration).(&block)
   end
 
-  class Pulser
-    def initialize(freq)
-      fiber = Fiber.current
-      @timer = EV::Timer.new(freq, freq)
-      @timer.start { fiber.transfer freq }
-    end
-
-    def await
-      suspend
-    rescue Exception => e
-      @timer.stop
-      raise e
-    end
-
-    def stop
-      @timer.stop
-    end
-  end
-
   def pulse(freq)
     Pulser.new(freq)
   end
@@ -107,18 +125,20 @@ module ::Kernel
     timer.stop
   end
 
-  def spawn(proc = nil, &block)
-    if proc.is_a?(Coprocess)
-      proc.run
-    else
-      Coprocess.new(&(block || proc)).run
-    end
-  end
-
   def supervise(&block)
     Supervisor.new.await(&block)
   end
 
+  alias_method :orig_system, :system
+  def system(*args)
+    Open3.popen2(*args) do |i, o, t|
+      i.close
+      o.read
+    end
+  rescue SystemCallError => e
+    nil
+  end
+
   def throttled_loop(rate, &block)
     throttler = Throttler.new(rate)
     loop do

data/lib/polyphony/http/server.rb

@@ -23,7 +23,7 @@ end
 def accept_loop(server, opts, &handler)
   while true
     client = server.accept
-    spawn { client_task(client, opts, &handler) }
+    coproc { client_task(client, opts, &handler) }
   end
 rescue OpenSSL::SSL::SSLError
   retry # disregard

data/lib/polyphony/postgres.rb

@@ -20,8 +20,6 @@ module ::PG
         return
       end
     end
-  ensure
-    conn.socket_io.stop_watchers
   end
 
   def self.connect_sync(conn)
@@ -46,8 +44,6 @@ class ::PG::Connection
       consume_input
     end
     orig_get_result(&block)
-  ensure
-    socket_io.stop_watchers
   end
 
   alias_method :orig_async_exec, :async_exec

data/lib/polyphony/version.rb

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

data/test/test_coprocess.rb

@@ -86,7 +86,7 @@ class CoprocessTest < MiniTest::Test
 
   def test_that_coprocess_can_be_awaited
     result = nil
-    spawn do
+    coproc do
       coprocess = Polyphony::Coprocess.new { sleep(0.001); 42 }
       result = coprocess.await
     end
@@ -96,7 +96,7 @@ class CoprocessTest < MiniTest::Test
 
   def test_that_coprocess_can_be_stopped
     result = nil
-    coprocess = spawn do
+    coprocess = coproc do
       sleep(0.001)
       result = 42
     end
@@ -107,7 +107,7 @@ class CoprocessTest < MiniTest::Test
 
   def test_that_coprocess_can_be_cancelled
     result = nil
-    coprocess = spawn do
+    coprocess = coproc do
       sleep(0.001)
       result = 42
     rescue Polyphony::Cancel => e
@@ -125,8 +125,8 @@ class CoprocessTest < MiniTest::Test
   def test_that_inner_coprocess_can_be_interrupted
     result = nil
     coprocess2 = nil
-    coprocess = spawn do
-      coprocess2 = spawn do
+    coprocess = coproc do
+      coprocess2 = coproc do
         sleep(0.001)
         result = 42
       end
@@ -143,8 +143,8 @@ class CoprocessTest < MiniTest::Test
   def test_that_inner_coprocess_can_interrupt_outer_coprocess
     result, coprocess2 = nil
     
-    coprocess = spawn do
-      coprocess2 = spawn do
+    coprocess = coproc do
+      coprocess2 = coproc do
         EV.next_tick { coprocess.interrupt }
         sleep(0.001)
         result = 42
@@ -168,7 +168,7 @@ class MailboxTest < MiniTest::Test
 
   def test_that_coprocess_can_receive_messages
     msgs = []
-    coproc = spawn {
+    coprocess = coproc {
       loop {
         msgs << receive
       }
@@ -176,16 +176,16 @@ class MailboxTest < MiniTest::Test
 
     EV.snooze # allow coproc to start
     
-    3.times { |i| coproc << i; EV.snooze }
+    3.times { |i| coprocess << i; EV.snooze }
 
     assert_equal([0, 1, 2], msgs)
   ensure
-    coproc.stop
+    coprocess.stop
   end
 
   def test_that_multiple_messages_sent_at_once_arrive
     msgs = []
-    coproc = spawn {
+    coprocess = coproc {
       loop { 
         msgs << receive
       }
@@ -193,12 +193,12 @@ class MailboxTest < MiniTest::Test
 
     EV.snooze # allow coproc to start
     
-    3.times { |i| coproc << i }
+    3.times { |i| coprocess << i }
 
     EV.snooze
 
     assert_equal([0, 1, 2], msgs)
   ensure
-    coproc.stop
+    coprocess.stop
   end
 end

data/test/test_core.rb

@@ -9,7 +9,7 @@ class SpawnTest < MiniTest::Test
 
   def test_that_spawn_returns_a_coprocess
     result = nil
-    coprocess = spawn { result = 42 }
+    coprocess = coproc { result = 42 }
 
     assert_kind_of(Polyphony::Coprocess, coprocess)
     assert_nil(result)
@@ -20,7 +20,7 @@ class SpawnTest < MiniTest::Test
   def test_that_spawn_accepts_coprocess_argument
     result = nil
     coprocess = Polyphony::Coprocess.new { result = 42 }
-    spawn coprocess
+    coproc coprocess
 
     assert_nil(result)
     suspend
@@ -28,7 +28,7 @@ class SpawnTest < MiniTest::Test
   end
 
   def test_that_spawned_coprocess_saves_result
-    coprocess = spawn { 42 }
+    coprocess = coproc { 42 }
 
     assert_kind_of(Polyphony::Coprocess, coprocess)
     assert_nil(coprocess.result)
@@ -38,7 +38,7 @@ class SpawnTest < MiniTest::Test
 
   def test_that_spawned_coprocess_can_be_interrupted
     result = nil
-    coprocess = spawn { sleep(1); 42 }
+    coprocess = coproc { sleep(1); 42 }
     EV.next_tick { coprocess.interrupt }
     suspend
     assert_nil(coprocess.result)
@@ -59,7 +59,7 @@ class CancelScopeTest < Minitest::Test
 
   def test_that_cancel_scope_cancels_coprocess
     ctx = {}
-    spawn do
+    coproc do
       EV::Timer.new(0.005, 0).start { ctx[:cancel_scope]&.cancel! }
       sleep_with_cancel(ctx, :cancel)
     rescue Exception => e
@@ -76,7 +76,7 @@ class CancelScopeTest < Minitest::Test
 
   # def test_that_cancel_scope_cancels_async_op_with_stop
   #   ctx = {}
-  #   spawn do
+  #   coproc do
   #     EV::Timer.new(0, 0).start { ctx[:cancel_scope].cancel! }
   #     sleep_with_cancel(ctx, :stop)
   #   end
@@ -88,7 +88,7 @@ class CancelScopeTest < Minitest::Test
 
   def test_that_cancel_after_raises_cancelled_exception
     result = nil
-    spawn do
+    coproc do
       cancel_after(0.01) do
         sleep(1000)
       end
@@ -103,7 +103,7 @@ class CancelScopeTest < Minitest::Test
   def test_that_cancel_scopes_can_be_nested
     inner_result = nil
     outer_result = nil
-    spawn do
+    coproc do
       move_on_after(0.01) do
         move_on_after(0.02) do
           sleep(1000)
@@ -119,7 +119,7 @@ class CancelScopeTest < Minitest::Test
     EV.rerun
 
     outer_result = nil
-    spawn do
+    coproc do
       move_on_after(0.02) do
         move_on_after(0.01) do
           sleep(1000)
@@ -154,7 +154,7 @@ class SupervisorTest < MiniTest::Test
   
   def test_that_supervisor_waits_for_all_nested_coprocesses_to_complete
     ctx = {}
-    spawn do
+    coproc do
       parallel_sleep(ctx)
     end
     suspend
@@ -165,10 +165,10 @@ class SupervisorTest < MiniTest::Test
 
   def test_that_supervisor_can_add_coprocesses_after_having_started
     result = []
-    spawn {
+    coproc {
       supervisor = Polyphony::Supervisor.new
       3.times do |i|
-        spawn do
+        coproc do
           sleep(0.001)
           supervisor.spawn do
             sleep(0.001)