lightio 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2adcb4321383299d719e6faa66696d14554e0d9c
-  data.tar.gz: 34ca8bb7b88f2f0753264016c21f7840dd48475d
+  metadata.gz: e60501b7bca5cc445161d405a11e4a7d688de116
+  data.tar.gz: 6068963377b9805a4cc93090d6d14eaba2df280a
 SHA512:
-  metadata.gz: 3ba852354c4797ec86547105b59e8364b6e51cacee2bf72bff882ec0e9a8f8a02c967e3a505766f2c6912dd50c628dbc1d339e1352177f532df86a1969e64187
-  data.tar.gz: 85b37be690bf476c772ca64082264447a3d07ea9fa2593b313ddca7c37174b618ea118b6e5f3ea99fe68f8edde6827d11ab7e9f84ef01f140e2b873417551711
+  metadata.gz: c9e29908ede0af65b6b8a6d86d7ed88f85de30e6275c7a34917ef3ed3e444ac6df2567de2392b9859daabae6158ead27dc2be4b13669adb0070aa895cae3d8ee
+  data.tar.gz: 391014cc0762ba84b948e9a18efe76377a61dcc6135926eec7c543a93b0921d9e707b52a1b260173a4286a90822716e264c4973c5238f85c2b4da24b0a875235

data/Gemfile.lock

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

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

@@ -53,6 +53,8 @@ module LightIO::Core
       extend Forwardable
       def_delegators :@selector, :closed?, :empty?, :backend, :wakeup
 
+      attr_reader :running
+
       def initialize
         # @selector = NIO::Selector.new
         @current_loop_time = nil

data/lib/lightio/core/beam.rb

@@ -49,7 +49,7 @@ module LightIO::Core
       super() {
         begin
           @value = yield(*args)
-        rescue StandardError => e
+        rescue Exception => e
           @error = e
         end
         # mark as dead
@@ -136,8 +136,11 @@ module LightIO::Core
       #
       # @return [nil]
       def pass
+        running = IOloop.current.running
         schedule = LightIO::Watchers::Schedule.new
         IOloop.current.wait(schedule)
+        # make sure ioloop run once
+        pass unless running
       end
     end
 

data/lib/lightio/core/ioloop.rb

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

data/lib/lightio/library/io.rb

@@ -118,16 +118,15 @@ module LightIO::Library
       @io_watcher.wait_readable
     end
 
-    def io_watcher
-      @io_watcher
-    end
-
     class << self
       def open(*args)
         io = self.new(*args)
-        yield io
-      ensure
-        io.close if io.respond_to? :close
+        return io unless block_given?
+        begin
+          yield io
+        ensure
+          io.close if io.respond_to? :close
+        end
       end
 
       def pipe(*args)
@@ -148,13 +147,19 @@ module LightIO::Library
         read_fds ||= []
         write_fds ||= []
         loop do
-          # clear io watcher status
-          read_fds.each {|fd| fd.send(:io_watcher).clear_status}
-          write_fds.each {|fd| fd.send(:io_watcher).clear_status}
+          # make sure io registered, then clear io watcher status
+          read_fds.each {|fd| get_io_watcher(fd).tap {|io| io.readable?; io.clear_status}}
+          write_fds.each {|fd| get_io_watcher(fd).tap {|io| io.writable?; io.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?}
+          r_fds = read_fds.select {|fd|
+            io = convert_to_io(fd)
+            io.closed? ? raise(IOError, 'closed stream') : get_io_watcher(io).readable?
+          }
+          w_fds = write_fds.select {|fd|
+            io = convert_to_io(fd)
+            io.closed? ? raise(IOError, 'closed stream') : get_io_watcher(io).writable?
+          }
           e_fds = []
           if r_fds.empty? && w_fds.empty?
             if timeout && Time.now - timer > timeout
@@ -165,6 +170,25 @@ module LightIO::Library
           end
         end
       end
+
+      private
+      def convert_to_io(io)
+        unless io.respond_to?(:to_io)
+          raise TypeError, "no implicit conversion of #{io.class} into IO"
+        end
+        to_io = io.to_io
+        unless to_io.is_a?(IO)
+          raise TypeError, "can't convert #{io.class} to IO (#{io.class}#to_io gives #{to_io.class})"
+        end
+        to_io
+      end
+
+      def get_io_watcher(io)
+        unless io.is_a?(IO)
+          io = convert_to_io(io)
+        end
+        io.instance_variable_get(:@io_watcher)
+      end
     end
   end
 end

data/lib/lightio/library/mutex.rb

@@ -4,7 +4,7 @@ module LightIO::Library
   class Thread
     class Mutex
       def initialize
-        @queue = Queue.new
+        @queue = LightIO::Library::Queue.new
         @queue << true
         @locked_thread = nil
       end
@@ -56,7 +56,38 @@ module LightIO::Library
         end
       end
     end
+
+    class ConditionVariable
+      def initialize
+        @queue = LightIO::Library::Queue.new
+      end
+
+
+      def broadcast
+        signal until @queue.num_waiting == 0
+        self
+      end
+
+      def signal
+        @queue << true unless @queue.num_waiting == 0
+        self
+      end
+
+      def wait(mutex, timeout=nil)
+        mutex.unlock
+        begin
+          LightIO::Library::Timeout.timeout(timeout) do
+            @queue.pop
+          end
+        rescue Timeout::Error
+          nil
+        end
+        mutex.lock
+        self
+      end
+    end
   end
 
   Mutex = Thread::Mutex
+  ConditionVariable = Thread::ConditionVariable
 end

data/lib/lightio/library/socket.rb

@@ -96,6 +96,11 @@ module LightIO::Library
       [self.class._wrap(socket), Addrinfo._wrap(addrinfo)]
     end
 
+    def accept_nonblock(*args)
+      socket, addrinfo = @io.accept_nonblock(*args)
+      [self.class._wrap(socket), Addrinfo._wrap(addrinfo)]
+    end
+
     def sys_accept
       @io_watcher.wait_readable
       @io.sys_accept
@@ -181,6 +186,11 @@ module LightIO::Library
       TCPSocket._wrap(socket)
     end
 
+    def accept_nonblock(*args)
+      socket = @io.accept_nonblock(*args)
+      TCPSocket._wrap(socket)
+    end
+
     def sys_accept
       @io_watcher.wait_readable
       @io.sys_accept

data/lib/lightio/library/thread.rb

@@ -51,13 +51,6 @@ module LightIO::Library
             obj.public_send method, *args
           end
         end
-
-        def fallback_thread_class_methods(*methods)
-          methods.each {|m| fallback_method(RAW_THREAD.main, m, "This method is fallback to native Thread class,"\
-                                                   " it may cause unexpected behaviour,"\
-                                                   " open issues on https://github.com/socketry/lightio/issues"\
-                                                   " if this behaviour not approach you purpose")}
-        end
       end
 
       include ClassMethods
@@ -76,10 +69,15 @@ module LightIO::Library
 
     class << self
       extend Forwardable
-      def_delegators :'LightIO::Library::Thread::RAW_THREAD', :DEBUG, :DEBUG=
+      def_delegators :'LightIO::Library::Thread::RAW_THREAD',
+                     :DEBUG,
+                     :DEBUG=,
+                     :handle_interrupt,
+                     :abort_on_exception,
+                     :abort_on_exception=,
+                     :pending_interrupt?
 
       include FallbackHelper
-      fallback_thread_class_methods :abort_on_exception, :abort_on_exception=
 
       def fork(*args, &blk)
         obj = allocate
@@ -155,8 +153,7 @@ module LightIO::Library
 
     fallback_main_thread_methods :abort_on_exception,
                                  :abort_on_exception=,
-                                 :handle_interrupt,
-                                 :pending_interrupt,
+                                 :pending_interrupt?,
                                  :add_trace_func,
                                  :backtrace,
                                  :backtrace_locations,

data/lib/lightio/version.rb

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

metadata

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