lightio 0.3.2 → 0.4.0.pre

data/lib/lightio/raw_proxy.rb

@@ -0,0 +1,24 @@
+# helper for access raw ruby object methods
+# use it to avoid monkey patch affect
+
+module LightIO
+  class RawProxy
+    def initialize(klass, methods: [], instance_methods: [])
+      @klass = klass
+      @methods = methods.map {|method| [method.to_sym, klass.method(method)]}.to_h
+      @instance_methods = instance_methods.map {|method| [method.to_sym, klass.instance_method(method)]}.to_h
+    end
+
+    def send(method, *args)
+      method = method.to_sym
+      return method_missing(method, *args) unless @methods.key?(method)
+      @methods[method].call(*args)
+    end
+
+    def instance_send(instance, method, *args)
+      method = method.to_sym
+      return method_missing(method, *args) unless @instance_methods.key?(method)
+      @instance_methods[method].bind(instance).call(*args)
+    end
+  end
+end

data/lib/lightio/version.rb

@@ -1,3 +1,3 @@
 module LightIO
-  VERSION = "0.3.2"
+  VERSION = "0.4.0.pre"
 end

data/lib/lightio/wrap.rb

@@ -1,22 +1,11 @@
-module LightIO::Wrap
-  WRAPPERS = {}
-  RAW_IO = ::IO
+# wrap module
+# wrap ruby objects, and make it work with lightio
 
+module LightIO::Wrap
   # wrapper for normal ruby objects
   module Wrapper
-    # wrap raw ruby objects
-    #
-    # @param [Object] io raw ruby object, param name is 'io' just for consistent
-    def initialize(io=nil)
-      @io ||= io
-    end
-
-    def method_missing(method, *args)
-      @io.public_send(method, *args)
-    end
-
     # both works in class scope and singleton class scope
-    module SingletonClassCommonMethods
+    module HelperMethods
       protected
       # run method in thread pool for performance
       def wrap_methods_run_in_threads_pool(*args)
@@ -24,60 +13,20 @@ module LightIO::Wrap
       end
     end
 
-    module ClassMethods
-      # Wrap raw io objects
-      def _wrap(io)
-        # In case ruby stdlib return already patched Sockets, just do nothing
-        if io.is_a? self
-          io
-        else
-          # old new
-          obj = allocate
-          obj.send(:initialize, io)
-          obj
-        end
-      end
-
-      # override new method, return wrapped class
-      def new(*args)
-        io = raw_class.new(*args)
-        _wrap(io)
-      end
-
-      include SingletonClassCommonMethods
-
-      protected
-
-      attr_reader :raw_class
-
-      # Set wrapped class
-      def wrap(raw_class)
-        @raw_class=raw_class
-        WRAPPERS[raw_class] = self
-      end
-
-      def method_missing(method, *args)
-        raw_class.public_send(method, *args)
-      end
-    end
-
     class << self
       def included(base)
-        base.send :extend, ClassMethods
-        base.singleton_class.send :extend, SingletonClassCommonMethods
+        base.send :extend, HelperMethods
       end
     end
   end
 
   # wrapper for ruby io objects
   module IOWrapper
-    include Wrapper
     # wrap raw ruby io objects
     #
     # @param [IO, Socket]  io raw ruby io object
-    def initialize(io=nil)
-      super
-      @io_watcher ||= LightIO::Watchers::IO.new(@io)
+    def initialize(*args)
+      @obj ||= super
     end
 
     protected
@@ -87,20 +36,24 @@ module LightIO::Wrap
     # @param [args] args arguments pass to method
     def wait_nonblock(method, *args)
       loop do
-        result = @io.__send__(method, *args, exception: false)
+        result = __send__(method, *args, exception: false)
         case result
           when :wait_readable
-            @io_watcher.wait_readable
+            io_watcher.wait_readable
           when :wait_writable
-            @io_watcher.wait_writable
+            io_watcher.wait_writable
           else
             return result
         end
       end
     end
 
+    def io_watcher
+      @io_watcher ||= LightIO::Watchers::IO.new(@obj)
+    end
+
     module ClassMethods
-      include Wrapper::ClassMethods
+      # include Wrapper::ClassMethods
       protected
       # wrap blocking method with "#{method}_nonblock"
       #
@@ -118,8 +71,8 @@ module LightIO::Wrap
 
     class << self
       def included(base)
-        Wrapper.included(base)
         base.send :extend, ClassMethods
+        base.send :include, Wrapper
       end
     end
   end

data/lightio.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/jjyr/lightio"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 2.3.4'
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightio
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Jiang Jinyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -92,6 +92,7 @@ files:
 - examples/beams.rb
 - examples/echo_server.rb
 - examples/echo_server_with_raw_socket.rb
+- examples/monkey_patch.rb
 - lib/lightio.rb
 - lib/lightio/core.rb
 - lib/lightio/core/backend/nio.rb
@@ -101,15 +102,25 @@ files:
 - lib/lightio/core/light_fiber.rb
 - lib/lightio/errors.rb
 - lib/lightio/library.rb
+- lib/lightio/library/base.rb
+- lib/lightio/library/file.rb
 - lib/lightio/library/io.rb
 - lib/lightio/library/kernel_ext.rb
-- lib/lightio/library/mutex.rb
 - lib/lightio/library/queue.rb
 - lib/lightio/library/sized_queue.rb
 - lib/lightio/library/socket.rb
 - lib/lightio/library/thread.rb
 - lib/lightio/library/threads_wait.rb
 - lib/lightio/library/timeout.rb
+- lib/lightio/module.rb
+- lib/lightio/module/base.rb
+- lib/lightio/module/file.rb
+- lib/lightio/module/io.rb
+- lib/lightio/module/socket.rb
+- lib/lightio/module/thread.rb
+- lib/lightio/module/threads_wait.rb
+- lib/lightio/monkey.rb
+- lib/lightio/raw_proxy.rb
 - lib/lightio/version.rb
 - lib/lightio/watchers.rb
 - lib/lightio/watchers/io.rb
@@ -130,12 +141,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11

data/lib/lightio/library/mutex.rb

@@ -1,93 +0,0 @@
-require_relative 'queue'
-
-module LightIO::Library
-  class Thread
-    class Mutex
-      def initialize
-        @queue = LightIO::Library::Queue.new
-        @queue << true
-        @locked_thread = nil
-      end
-
-      def lock
-        raise ThreadError, "deadlock; recursive locking" if owner?
-        @queue.pop
-        @locked_thread = LightIO::Thread.current
-        self
-      end
-
-      def unlock
-        raise ThreadError, "Attempt to unlock a mutex which is not locked" unless owner?
-        @locked_thread = nil
-        @queue << true
-        self
-      end
-
-      def locked?
-        !@locked_thread.nil?
-      end
-
-      def owner?
-        @locked_thread == LightIO::Thread.current
-      end
-
-      def sleep(timeout=nil)
-        unlock
-        LightIO.sleep(timeout)
-        lock
-      end
-
-      def synchronize
-        raise ThreadError, 'must be called with a block' unless block_given?
-        lock
-        begin
-          yield
-        ensure
-          unlock
-        end
-      end
-
-      def try_lock
-        if @locked_thread.nil?
-          lock
-          true
-        else
-          false
-        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