lightio 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2da560fd469b39e6d55ee4acbe7ef0bae81602ae
-  data.tar.gz: 665f6fc976e45793695b3daa53810096f7db88a6
+  metadata.gz: 2adcb4321383299d719e6faa66696d14554e0d9c
+  data.tar.gz: 34ca8bb7b88f2f0753264016c21f7840dd48475d
 SHA512:
-  metadata.gz: b1dbaf889b0b2649f110786e75aba70b42a02c0b887f3c9e5aff27bc5ee8049ffaec5ca911765492ddbff05ca24e773d0dcbff6859e05b40f1e64b571f0bad8c
-  data.tar.gz: e3bf2ff085faf5c582d6e57be7c9aff14a144f614b259720c86663d4fa71f23da895499152d4746fe5f28212984c0367520e2d0c9e06adfb8fb04aeb3461908c
+  metadata.gz: 3ba852354c4797ec86547105b59e8364b6e51cacee2bf72bff882ec0e9a8f8a02c967e3a505766f2c6912dd50c628dbc1d339e1352177f532df86a1969e64187
+  data.tar.gz: 85b37be690bf476c772ca64082264447a3d07ea9fa2593b313ddca7c37174b618ea118b6e5f3ea99fe68f8edde6827d11ab7e9f84ef01f140e2b873417551711

data/Gemfile.lock

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

data/lib/lightio/core/backend/nio.rb

@@ -1,6 +1,7 @@
 # use nio4r implement event loop, inspired from eventmachine/pure_ruby implement
 require 'nio'
 require 'set'
+require 'forwardable'
 module LightIO::Core
   module Backend
 
@@ -49,6 +50,9 @@ module LightIO::Core
 
     # LightIO use NIO as default event-driving backend
     class NIO
+      extend Forwardable
+      def_delegators :@selector, :closed?, :empty?, :backend, :wakeup
+
       def initialize
         # @selector = NIO::Selector.new
         @current_loop_time = nil
@@ -93,14 +97,12 @@ module LightIO::Core
       end
 
       def stop
-        return unless @running
+        return if closed?
         @running = false
-        raise
+        @selector.close
       end
 
-      def backend
-        @selector.backend
-      end
+      alias close stop
 
       def env_backend
         key = 'LIGHTIO_BACKEND'.freeze

data/lib/lightio/core/ioloop.rb

@@ -15,7 +15,7 @@ module LightIO::Core
     end
 
     extend Forwardable
-    def_delegators :@backend, :run, :add_timer, :add_callback, :add_io_wait, :cancel_io_wait, :backend
+    def_delegators :@backend, :run, :add_timer, :add_callback, :add_io_wait, :cancel_io_wait, :backend, :close, :closed?, :stop
 
     # Wait a watcher, watcher can be a timer or socket.
     # see LightIO::Watchers module for detail

data/lib/lightio/library/io.rb

@@ -118,6 +118,10 @@ module LightIO::Library
       @io_watcher.wait_readable
     end
 
+    def io_watcher
+      @io_watcher
+    end
+
     class << self
       def open(*args)
         io = self.new(*args)
@@ -141,14 +145,18 @@ module LightIO::Library
 
       def select(read_fds, write_fds=nil, _except_fds=nil, timeout=nil)
         timer = timeout && Time.now
-        # run once ioloop
-        LightIO.sleep 0
+        read_fds ||= []
+        write_fds ||= []
         loop do
-          r_fds = (read_fds || []).select {|fd| fd.closed? ? raise(IOError, 'closed stream') : fd.instance_variable_get(:@io_watcher).readable?}
-          w_fds = (write_fds || []).select {|fd| fd.closed? ? raise(IOError, 'closed stream') : fd.instance_variable_get(:@io_watcher).writable?}
+          # clear io watcher status
+          read_fds.each {|fd| fd.send(:io_watcher).clear_status}
+          write_fds.each {|fd| fd.send(:io_watcher).clear_status}
+          # run ioloop once
+          LightIO.sleep 0
+          r_fds = read_fds.select {|fd| fd.closed? ? raise(IOError, 'closed stream') : fd.send(:io_watcher).readable?}
+          w_fds = write_fds.select {|fd| fd.closed? ? raise(IOError, 'closed stream') : fd.send(:io_watcher).writable?}
           e_fds = []
           if r_fds.empty? && w_fds.empty?
-            LightIO.sleep 0
             if timeout && Time.now - timer > timeout
               return nil
             end

data/lib/lightio/version.rb

@@ -1,3 +1,3 @@
 module LightIO
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/lightio/watchers/io.rb

@@ -23,6 +23,8 @@ module LightIO::Watchers
       @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
     end
 
     # NIO::Monitor
@@ -41,18 +43,26 @@ module LightIO::Watchers
     extend Forwardable
     def_delegators :monitor, :interests, :interests=, :closed?
 
+    # this method return previous IO.select status
+    # should avoid to directly use
     def readable?
       check_monitor_read
-      monitor.readable?
+      @readiness == :r || @readiness == :rw
     end
 
+    # this method return previous IO.select status
+    # should avoid to directly use
     def writable?
       check_monitor_write
-      monitor.writable?
+      @readiness == :w || @readiness == :rw
     end
 
     alias :writeable? :writable?
 
+    def clear_status
+      @readiness = nil
+    end
+
     # Blocking until io is readable
     # @param [Numeric]  timeout return nil after timeout seconds, otherwise return self
     # @return [LightIO::Watchers::IO, nil]
@@ -142,6 +152,8 @@ module LightIO::Watchers
     end
 
     def callback_on_waiting
+      # update readiness on callback
+      @readiness = monitor.readiness
       # only call callback on waiting
       return unless io_is_ready?
       if @error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jiang Jinyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r