polyphony 0.36 → 0.42

data/lib/polyphony/extensions/io.rb

@@ -2,7 +2,7 @@
 
 require 'open3'
 
-# IO overrides
+# IO class method patches
 class ::IO
   class << self
     alias_method :orig_binread, :binread
@@ -72,7 +72,10 @@ class ::IO
       Open3.popen2(cmd) { |_i, o, _t| yield o }
     end
   end
+end
 
+# IO instance method patches
+class ::IO
   # def each(sep = $/, limit = nil, chomp: nil)
   #   sep, limit = $/, sep if sep.is_a?(Integer)
   # end
@@ -93,6 +96,39 @@ class ::IO
   # def getc
   # end
 
+  alias_method :orig_read, :read
+  def read(len = 1 << 30)
+    @read_buffer ||= +''
+    result = Thread.current.agent.read(self, @read_buffer, len, true)
+    return nil unless result
+
+    already_read = @read_buffer
+    @read_buffer = +''
+    already_read
+  end
+
+  alias_method :orig_readpartial, :read
+  def readpartial(len)
+    @read_buffer ||= +''
+    result = Thread.current.agent.read(self, @read_buffer, len, false)
+    raise EOFError unless result
+
+    already_read = @read_buffer
+    @read_buffer = +''
+    already_read
+  end
+
+  alias_method :orig_write, :write
+  def write(str)
+    Thread.current.agent.write(self, str)
+  end
+
+  alias_method :orig_write_chevron, :<<
+  def <<(str)
+    Thread.current.agent.write(self, str)
+    self
+  end
+
   alias_method :orig_gets, :gets
   def gets(sep = $/, _limit = nil, _chomp: nil)
     if sep.is_a?(Integer)
@@ -101,23 +137,17 @@ class ::IO
     end
     sep_size = sep.bytesize
 
-    @gets_buffer ||= +''
+    @read_buffer ||= +''
 
     loop do
-      idx = @gets_buffer.index(sep)
-      return @gets_buffer.slice!(0, idx + sep_size) if idx
-
-      if (data = readpartial(8192))
-        @gets_buffer << data
-      else
-        return nil if @gets_buffer.empty?
+      idx = @read_buffer.index(sep)
+      return @read_buffer.slice!(0, idx + sep_size) if idx
 
-        line = @gets_buffer.freeze
-        @gets_buffer = +''
-        return line
-      end
+      data = readpartial(8192)
+      @read_buffer << data
+    rescue EOFError
+      return nil
     end
-    # orig_gets(sep, limit, chomp: chomp)
   end
 
   # def print(*args)
@@ -171,16 +201,16 @@ class ::IO
     buf ? readpartial(maxlen, buf) : readpartial(maxlen)
   end
 
-  alias_method :orig_read, :read
-  def read(length = nil, outbuf = nil)
-    if length
-      return outbuf ? readpartial(length) : readpartial(length, outbuf)
-    end
-
-    until eof?
-      outbuf ||= +''
-      outbuf << readpartial(8192)
-    end
-    outbuf
-  end
+  # alias_method :orig_read, :read
+  # def read(length = nil, outbuf = nil)
+  #   if length
+  #     return outbuf ? readpartial(length) : readpartial(length, outbuf)
+  #   end
+
+  #   until eof?
+  #     outbuf ||= +''
+  #     outbuf << readpartial(8192)
+  #   end
+  #   outbuf
+  # end
 end

data/lib/polyphony/extensions/openssl.rb

@@ -2,7 +2,7 @@
 
 require 'openssl'
 
-import('./socket')
+require_relative './socket'
 
 # Open ssl socket helper methods (to make it compatible with Socket API)
 class ::OpenSSL::SSL::SSLSocket
@@ -19,12 +19,10 @@ class ::OpenSSL::SSL::SSLSocket
   end
 
   def sysread(maxlen, buf)
-    read_watcher = nil
-    write_watcher = nil
     loop do
       case (result = read_nonblock(maxlen, buf, exception: false))
-      when :wait_readable then (read_watcher ||= io.read_watcher).await
-      when :wait_writable then (write_watcher ||= io.write_watcher).await
+      when :wait_readable then Thread.current.agent.wait_io(io, false)
+      when :wait_writable then Thread.current.agent.wait_io(io, true)
       else result
       end
     end
@@ -40,12 +38,10 @@ class ::OpenSSL::SSL::SSLSocket
   end
 
   def syswrite(buf)
-    read_watcher = nil
-    write_watcher = nil
     loop do
       case (result = write_nonblock(buf, exception: false))
-      when :wait_readable then (read_watcher ||= io.read_watcher).await
-      when :wait_writable then (write_watcher ||= io.write_watcher).await
+      when :wait_readable then Thread.current.agent.wait_io(io, false)
+      when :wait_writable then Thread.current.agent.wait_io(io, true)
       else result
       end
     end

data/lib/polyphony/extensions/socket.rb

@@ -2,18 +2,26 @@
 
 require 'socket'
 
-import('./io')
+require_relative './io'
+require_relative '../core/thread_pool'
 
 # Socket overrides (eventually rewritten in C)
 class ::Socket
+  def accept
+    Thread.current.agent.accept(self)
+  end
+
   NO_EXCEPTION = { exception: false }.freeze
 
   def connect(remotesockaddr)
     loop do
       result = connect_nonblock(remotesockaddr, **NO_EXCEPTION)
-      return if result == 0
-
-      result == :wait_writable ? write_watcher.await : (raise IOError)
+      case result
+      when 0 then return
+      when :wait_writable then Thread.current.agent.wait_io(self, true)
+      else
+        raise IOError
+      end
     end
   end
 
@@ -21,9 +29,12 @@ class ::Socket
     outbuf ||= +''
     loop do
       result = recv_nonblock(maxlen, flags, outbuf, **NO_EXCEPTION)
-      raise IOError unless result
-
-      result == :wait_readable ? read_watcher.await : (return result)
+      case result
+      when nil then raise IOError
+      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      else
+        return result
+      end
     end
   end
 
@@ -31,9 +42,12 @@ class ::Socket
     @read_buffer ||= +''
     loop do
       result = recvfrom_nonblock(maxlen, flags, @read_buffer, **NO_EXCEPTION)
-      raise IOError unless result
-
-      result == :wait_readable ? read_watcher.await : (return result)
+      case result
+      when nil then raise IOError
+      when :wait_readable then Thread.current.agent.wait_io(self, false)
+      else
+        return result
+      end
     end
   end
 
@@ -116,4 +130,9 @@ class ::TCPServer
   def accept
     @io ? @io.accept : orig_accept
   end
+
+  alias_method :orig_close, :close
+  def close
+    @io ? @io.close : orig_close
+  end
 end

data/lib/polyphony/extensions/thread.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Exceptions = import '../core/exceptions'
+require_relative '../core/exceptions'
 
 # Thread extensions
 class ::Thread
@@ -8,26 +8,30 @@ class ::Thread
 
   alias_method :orig_initialize, :initialize
   def initialize(*args, &block)
-    @join_wait_queue = Gyro::Queue.new
+    @join_wait_queue = []
+    @finalization_mutex = Mutex.new
     @args = args
     @block = block
-    @finalization_mutex = Mutex.new
     orig_initialize { execute }
   end
 
   def execute
+    # agent must be created in the context of the new thread, therefore it
+    # cannot be created in Thread#initialize
+    @agent = Polyphony::LibevAgent.new
     setup
     @ready = true
     result = @block.(*@args)
-  rescue Exceptions::MoveOn, Exceptions::Terminate => e
+  rescue Polyphony::MoveOn, Polyphony::Terminate => e
     result = e.value
-  rescue Exception => e
-    result = e
+  rescue Exception => result
   ensure
     @ready = true
     finalize(result)
   end
 
+  attr_accessor :agent
+
   def setup
     @main_fiber = Fiber.current
     @main_fiber.setup_main_fiber
@@ -44,24 +48,25 @@ class ::Thread
       @result = result
       signal_waiters(result)
     end
-    stop_event_selector
+    @agent.finalize
   end
 
   def signal_waiters(result)
-    @join_wait_queue.shift_each { |w| w.signal(result) }
+    @join_wait_queue.each { |w| w.signal(result) }
   end
 
   alias_method :orig_join, :join
   def join(timeout = nil)
-    async = Fiber.current.auto_async
+    watcher = Fiber.current.auto_watcher
+
     @finalization_mutex.synchronize do
       if @terminated
         @result.is_a?(Exception) ? (raise @result) : (return @result)
       else
-        @join_wait_queue.push(async)
+        @join_wait_queue << watcher
       end
     end
-    timeout ? move_on_after(timeout) { async.await } : async.await
+    timeout ? move_on_after(timeout) { watcher.await } : watcher.await
   end
   alias_method :await, :join
 
@@ -78,7 +83,9 @@ class ::Thread
 
   alias_method :orig_kill, :kill
   def kill
-    raise Exceptions::Terminate
+    return if @terminated
+
+    raise Polyphony::Terminate
   end
 
   alias_method :orig_inspect, :inspect

data/lib/polyphony/net.rb

@@ -1,73 +1,77 @@
 # frozen_string_literal: true
 
-export  :tcp_connect,
-        :tcp_listen
+require_relative './extensions/socket'
+require_relative './extensions/openssl'
 
-import('./extensions/socket')
-import('./extensions/openssl')
+module Polyphony
+  # A more elegant networking API
+  module Net
+    class << self
+      def tcp_connect(host, port, opts = {})
+        socket = ::Socket.new(:INET, :STREAM).tap do |s|
+          addr = ::Socket.sockaddr_in(port, host)
+          s.connect(addr)
+        end
+        if opts[:secure_context] || opts[:secure]
+          secure_socket(socket, opts[:secure_context], opts.merge(host: host))
+        else
+          socket
+        end
+      end
 
-def tcp_connect(host, port, opts = {})
-  socket = ::Socket.new(:INET, :STREAM).tap do |s|
-    addr = ::Socket.sockaddr_in(port, host)
-    s.connect(addr)
-  end
-  if opts[:secure_context] || opts[:secure]
-    secure_socket(socket, opts[:secure_context], opts.merge(host: host))
-  else
-    socket
-  end
-end
+      def tcp_listen(host = nil, port = nil, opts = {})
+        host ||= '0.0.0.0'
+        raise 'Port number not specified' unless port
 
-def tcp_listen(host = nil, port = nil, opts = {})
-  host ||= '0.0.0.0'
-  raise 'Port number not specified' unless port
+        socket = socket_from_options(host, port, opts)
+        if opts[:secure_context] || opts[:secure]
+          secure_server(socket, opts[:secure_context], opts)
+        else
+          socket
+        end
+      end
 
-  socket = socket_from_options(host, port, opts)
-  if opts[:secure_context] || opts[:secure]
-    secure_server(socket, opts[:secure_context], opts)
-  else
-    socket
-  end
-end
+      def socket_from_options(host, port, opts)
+        ::Socket.new(:INET, :STREAM).tap do |s|
+          s.reuse_addr if opts[:reuse_addr]
+          s.dont_linger if opts[:dont_linger]
+          addr = ::Socket.sockaddr_in(port, host)
+          s.bind(addr)
+          s.listen(0)
+        end
+      end
 
-def socket_from_options(host, port, opts)
-  ::Socket.new(:INET, :STREAM).tap do |s|
-    s.reuse_addr if opts[:reuse_addr]
-    s.dont_linger if opts[:dont_linger]
-    addr = ::Socket.sockaddr_in(port, host)
-    s.bind(addr)
-    s.listen(0)
-  end
-end
+      def secure_socket(socket, context, opts)
+        context ||= OpenSSL::SSL::SSLContext.new
+        setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
+        socket = secure_socket_wrapper(socket, context)
 
-def secure_socket(socket, context, opts)
-  context ||= OpenSSL::SSL::SSLContext.new
-  setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
-  socket = secure_socket_wrapper(socket, context)
+        socket.tap do |s|
+          s.hostname = opts[:host] if opts[:host]
+          s.connect
+          s.post_connection_check(opts[:host]) if opts[:host]
+        end
+      end
 
-  socket.tap do |s|
-    s.hostname = opts[:host] if opts[:host]
-    s.connect
-    s.post_connection_check(opts[:host]) if opts[:host]
-  end
-end
-
-def secure_socket_wrapper(socket, context)
-  if context
-    OpenSSL::SSL::SSLSocket.new(socket, context)
-  else
-    OpenSSL::SSL::SSLSocket.new(socket)
-  end
-end
+      def secure_socket_wrapper(socket, context)
+        if context
+          OpenSSL::SSL::SSLSocket.new(socket, context)
+        else
+          OpenSSL::SSL::SSLSocket.new(socket)
+        end
+      end
 
-def secure_server(socket, context, opts)
-  setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
-  OpenSSL::SSL::SSLServer.new(socket, context)
-end
+      def secure_server(socket, context, opts)
+        setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
+        OpenSSL::SSL::SSLServer.new(socket, context)
+      end
 
-def setup_alpn(context, protocols)
-  context.alpn_protocols = protocols
-  context.alpn_select_cb = lambda do |peer_protocols|
-    (protocols & peer_protocols).first
+      def setup_alpn(context, protocols)
+        context.alpn_protocols = protocols
+        context.alpn_select_cb = lambda do |peer_protocols|
+          (protocols & peer_protocols).first
+        end
+      end
+    end
   end
 end