lightio 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d60e525147d0be04ceecef1b5d5707dbaeeba6d1
-  data.tar.gz: 69c611c348c2837484857e850834e6bc93fc6c44
+SHA256:
+  metadata.gz: 0461dd68b60dfa05c34fabdcd916ef074de8e634634174fc5253dbc5083d221a
+  data.tar.gz: 0715bf64fe6b6150d629136b621eec9d6a79c72dc7110e19082dd4e59b14a0a9
 SHA512:
-  metadata.gz: a53025d4e89dcfab86d8c41af53b0a8ac078d86d9a220549a364638be22be4da133c303ce3e738a910b6a9844907a5c4ee506f27fa041728930770ea0ac1ea61
-  data.tar.gz: 60e88d7aed7cf946368cc1f2aa6786d644c00d30fa9f2c0855b5cb9fb1c41d4837e0e98b52beb85fbaa761af9c39beaa92dda8cfcbdea6afb584b0859bcc831f
+  metadata.gz: 8c7796bdbcb7cc253979813fe394fe65dec6eab3ee53384042a267fa5cf2fef316a946b732e0adc42f1c343c53c4602f7149617d7626066984156ea8fc581d0b
+  data.tar.gz: 71e6b9f3b63d6e236ea6fb5b0629f6634fe9d60d459d63f78fd5b7406027ca5858add3e0f0d502278938db0d6e2b4d8e930171850a9fa7305b695b6fc5de3ce5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lightio (0.4.2)
+    lightio (0.4.3)
       nio4r (~> 2.2)
 
 GEM

data/README.md

@@ -5,6 +5,7 @@
 [![Build Status](https://travis-ci.org/socketry/lightio.svg?branch=master)](https://travis-ci.org/socketry/lightio)
 [![Coverage Status](https://coveralls.io/repos/github/socketry/lightio/badge.svg?branch=master)](https://coveralls.io/github/socketry/lightio?branch=master)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/jjyr/lightio/blob/master/LICENSE.txt)
+[![Gitter](https://badges.gitter.im/join.svg)](https://gitter.im/lightio-dev/Lobby)
 
 LightIO provide green thread to ruby. Like Golang's goroutine, or Crystal's fiber. In LightIO it called beam. 
 

data/lib/lightio/core/future.rb

@@ -12,6 +12,7 @@ module LightIO::Core
       @value = nil
       @ioloop = IOloop.current
       @state = :init
+      @light_fiber = nil
     end
 
     def done?

data/lib/lightio/library/base.rb

@@ -98,6 +98,7 @@ module LightIO::Library
         else
           mock_obj = allocate
           mock_obj.instance_variable_set(:@obj, obj)
+          mock_obj.__send__(:call_lightio_initialize)
           mock_obj
         end
       end
@@ -106,9 +107,15 @@ module LightIO::Library
     def initialize(*args)
       obj = self.class.send(:call_method_from_ancestors, :mock_klass).send(:origin_new, *args)
       @obj = obj
+      call_lightio_initialize
+      @obj
     end
 
     private
+    def call_lightio_initialize
+      __send__(:lightio_initialize) if respond_to?(:lightio_initialize, true)
+    end
+
     def light_io_raw_obj
       @obj
     end

data/lib/lightio/library/io.rb

@@ -1,3 +1,5 @@
+require 'io/wait'
+
 module LightIO::Library
   class IO
     include Base
@@ -19,8 +21,25 @@ module LightIO::Library
         end
       end
 
+      def lightio_initialize
+        @readbuf = StringIO.new
+        @readbuf.set_encoding(@obj.external_encoding) if @obj.respond_to?(:external_encoding)
+        @eof = nil
+        @seek = 0
+      end
+
       def wait(timeout = nil, mode = :read)
-        io_watcher.wait(timeout, mode) && self
+        # avoid wait if can immediately return
+        wait_result = if RUBY_VERSION < '2.4'
+                        if mode == :read
+                          @obj.wait_readable(0)
+                        elsif mode == :write
+                          @obj.wait_writable(0)
+                        end
+                      else
+                        @obj.wait(0, mode)
+                      end
+        (wait_result || io_watcher.wait(timeout, mode)) && self
       end
 
       def wait_readable(timeout = nil)
@@ -31,30 +50,21 @@ module LightIO::Library
         wait(timeout, :write) && self
       end
 
-      def read(length=nil, outbuf=nil)
-        raise ArgumentError, "negative length #{length} given" if length && length < 0
-        (outbuf ||= "").clear
-        loop do
-          readlen = length.nil? ? 4096 : length - outbuf.size
-          if (data = wait_nonblock(:read_nonblock, readlen))
-            outbuf << data
-            if length == outbuf.size
-              return outbuf
-            end
-          else
-            return outbuf.empty? && length ? nil : outbuf
-          end
+      def read(length = nil, outbuf = nil)
+        while !fill_read_buf && (length.nil? || length > @readbuf.length - @readbuf.pos)
+          wait_readable
         end
+        @readbuf.read(length, outbuf)
       end
 
-      def readpartial(maxlen, outbuf=nil)
-        (outbuf ||= "").clear
-        if (data = wait_nonblock(:read_nonblock, maxlen))
-          outbuf << data
-        else
-          raise EOFError, 'end of file reached'
+      def readpartial(maxlen, outbuf = nil)
+        raise ArgumentError, "negative length #{maxlen} given" if maxlen < 0
+        fill_read_buf
+        while @readbuf.eof? && !io_eof?
+          wait_readable
+          fill_read_buf
         end
-        outbuf
+        @readbuf.readpartial(maxlen, outbuf)
       end
 
       def getbyte
@@ -62,8 +72,13 @@ module LightIO::Library
       end
 
       def getc
-        wait_readable
-        @obj.getc
+        fill_read_buf
+        until (c = @readbuf.getc)
+          return nil if nonblock_eof?
+          wait_readable
+          fill_read_buf
+        end
+        c
       end
 
       def readline(*args)
@@ -73,11 +88,10 @@ module LightIO::Library
       end
 
       def readlines(*args)
-        result = []
-        until eof?
-          result << readline(*args)
+        until fill_read_buf
+          wait_readable
         end
-        result
+        @readbuf.readlines(*args)
       end
 
       def readchar
@@ -93,8 +107,13 @@ module LightIO::Library
       end
 
       def eof
-        wait_readable
-        @obj.eof
+        # until eof have a value
+        fill_read_buf
+        while @readbuf.eof? && @eof.nil?
+          wait_readable
+          fill_read_buf
+        end
+        nonblock_eof?
       end
 
       alias eof? eof
@@ -103,19 +122,17 @@ module LightIO::Library
         raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0..2)" if args.size > 2
         sep = $/
         if args[0].is_a?(Numeric)
-          limit = args.shift
+          limit = args[0]
         else
-          sep = args.shift if args.size > 0
-          limit = args.shift if args.first.is_a?(Numeric)
+          sep = args[0] if args.size > 0
+          limit = args[1] if args[1].is_a?(Numeric)
         end
-        s = ''
-        while (c = getbyte)
-          s << c
-          break if limit && s.size == limit
-          break if c == sep
+        until fill_read_buf
+          break if limit && limit <= @readbuf.length
+          break if sep && @readbuf.string.index(sep)
+          wait_readable
         end
-        s = nil if s.empty?
-        $_ = s
+        @readbuf.gets(*args)
       end
 
       def print(*obj)
@@ -135,11 +152,79 @@ module LightIO::Library
         end
       end
 
+      def flush
+        @obj.flush
+        self
+      end
+
       def close(*args)
         # close watcher before io closed
         io_watcher.close
         @obj.close
       end
+
+      private
+
+      def nonblock_eof?
+        @readbuf.eof? && io_eof?
+      end
+
+      def io_eof?
+        @eof
+      end
+
+      BUF_CHUNK_SIZE = 1024 * 16
+
+      def fill_read_buf
+        return true if @eof
+        while (data = @obj.read_nonblock(BUF_CHUNK_SIZE, exception: false))
+          case data
+            when :wait_readable, :wait_writable
+              # set eof to unknown(nil)
+              @eof = nil
+              return nil
+            else
+              # set eof to false
+              @eof = false if @eof.nil?
+              @readbuf.string << data
+          end
+        end
+        # set eof to true
+        @eof = true
+      end
+    end
+
+    def set_encoding(*args)
+      @readbuf.set_encoding(*args)
+      super(*args)
+    end
+
+    def lineno
+      @readbuf.lineno
+    end
+
+    def lineno= no
+      @readbuf.lineno = no
+    end
+
+    def rewind
+      # clear buf if seek offset is not zero
+      unless @seek.zero?
+        @seek = 0
+        @readbuf.string.clear
+      end
+      @readbuf.rewind
+    end
+
+    def seek(*args)
+      @readbuf.string.clear
+      @seek = args[0]
+      @obj.seek(*args)
+    end
+
+    def binmode
+      @obj.binmode
+      self
     end
 
     prepend IOMethods

data/lib/lightio/library/socket.rb

@@ -153,6 +153,7 @@ module LightIO::Library
       @obj = socket
       wait_nonblock(:connect_nonblock, remote_address)
       @obj
+      lightio_initialize
     end
 
     private
@@ -167,6 +168,7 @@ module LightIO::Library
 
     def initialize(*args)
       @obj = ::TCPServer.send(:origin_new, *args)
+      lightio_initialize
     end
 
     def accept

data/lib/lightio/version.rb

@@ -1,3 +1,3 @@
 module LightIO
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/lightio/watchers/io.rb

@@ -21,16 +21,19 @@ module LightIO::Watchers
       @io = io
       @ioloop = LightIO::Core::IOloop.current
       @waiting = false
-      ObjectSpace.define_finalizer(self, self.class.finalizer(@monitor))
       @error = nil
       # maintain socket status, see https://github.com/socketry/lightio/issues/1
       @readiness = nil
+      @monitor = nil
     end
 
     # NIO::Monitor
     def monitor(interests=:rw)
       @monitor ||= begin
-        @ioloop.add_io_wait(@io, interests) {callback_on_waiting}
+        raise @error if @error
+        monitor = @ioloop.add_io_wait(@io, interests) {callback_on_waiting}
+        ObjectSpace.define_finalizer(self, self.class.finalizer(monitor))
+        monitor
       end
     end
 
@@ -41,7 +44,13 @@ module LightIO::Watchers
     end
 
     extend Forwardable
-    def_delegators :monitor, :interests, :interests=, :closed?
+    def_delegators :monitor, :interests, :interests=
+
+    def closed?
+      # check @monitor exists, avoid unnecessary monitor created
+      return true unless @monitor
+      monitor.closed?
+    end
 
     # this method return previous IO.select status
     # should avoid to directly use
@@ -90,9 +99,9 @@ module LightIO::Watchers
     end
 
     def close
+      set_close_error
       return if closed?
       monitor.close
-      @error = IOError.new('closed stream')
       callback_on_waiting
     end
 
@@ -107,6 +116,10 @@ module LightIO::Watchers
     end
 
     private
+    def set_close_error
+      @error ||= IOError.new('closed stream')
+    end
+
     def check_monitor(mode)
       case mode
         when :read

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightio
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jiang Jinyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: LightIO is a ruby networking library, that combines ruby fiber and fast IO