rbgo 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae31a8f82bcb17f6ef6b4731a7943dcfc54354f3f917c1bba6ad0db28928f239
-  data.tar.gz: d7204fed9c21e51c2eaea41397f71fe14ed2b477e42dab134185cb265469f8a6
+  metadata.gz: 31f4096cd6341d864c580b0fbdf97f1c15a4658ff8e2f121da2b3231ba93e680
+  data.tar.gz: 22cb35759bab5c8fb1444ab4bab0e20524224d36ce4b2262bc33034f8ae0fb29
 SHA512:
-  metadata.gz: 8cf78287a1fe22e763384d474e7d9703a19f4770d026108bf04ddc1c0a6e105658ab16865200bb92a186979f972152e49db23f828c2d4809b8ef56a6098b613c
-  data.tar.gz: 7d9fdfd4915c70b8f29b811dac898b9bc3bcbca7ea78dd63e23c5a58c268b901321bc7727c0bc546d36b7f5d56cad85874ed6d31e07fcbe7a5aa740b9f123b89
+  metadata.gz: d270027b24ce105909fe8f814f801ae07441afe723bbc0a84913c784e38ae68134f3c7df04872d76d0235de99c01a16e0c2cb3acbfbb733d67d3b86f7be0547b
+  data.tar.gz: 5016e05b7f48d951efd297137ec8fbf17581cf70be43fccb9315b41abbc0b60854f45755bccd8f6523733924eb5b6aea2483a743b40f05c5b53692fc1375aacf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbgo (0.1.4)
+    rbgo (0.1.6)
       sys-cpu (~> 0.8)
 
 GEM

data/lib/rbgo/select_chan.rb

@@ -1,6 +1,4 @@
 require 'thread'
-require 'set'
-require 'monitor'
 
 module Rbgo
   module Channel
@@ -16,63 +14,12 @@ module Rbgo
 
       private
 
-      def register(observer:, mode: :rw)
-        unless observer.is_a? ConditionVariable
-          return false
-        end
-        mode = mode.to_sym.downcase
-        if mode == :rw
-          @readable_observers.synchronize do
-            @readable_observers.add(observer)
-          end
-          @writable_observers.synchronize do
-            @writable_observers.add(observer)
-          end
-        elsif mode == :r
-          @readable_observers.synchronize do
-            @readable_observers.add(observer)
-          end
-        elsif mode == :w
-          @writable_observers.synchronize do
-            @writable_observers.add(observer)
-          end
-        else
-          return false
-        end
-        true
-      end
-
-      def unregister(observer:, mode: :rw)
-        mode = mode.to_sym.downcase
-        if mode == :rw
-          @readable_observers.synchronize do
-            @readable_observers.delete(observer)
-          end
-          @writable_observers.synchronize do
-            @writable_observers.delete(observer)
-          end
-        elsif mode == :r
-          @readable_observers.synchronize do
-            @readable_observers.delete(observer)
-          end
-        elsif mode == :w
-          @writable_observers.synchronize do
-            @writable_observers.delete(observer)
-          end
-        else
-          return false
-        end
-        true
-      end
+      attr_accessor :io_r, :io_w
 
-      def notify_readable_observers
-        @readable_observers.each(&:broadcast)
-        nil
-      end
-
-      def notify_writable_observers
-        @writable_observers.each(&:broadcast)
-        nil
+      def notify
+        tmp                  = io_w
+        self.io_r, self.io_w = IO.pipe
+        tmp.close
       end
     end
 
@@ -95,10 +42,7 @@ module Rbgo
         self.have_enq_waiting_flag = false
         self.have_deq_waiting_flag = false
 
-        @readable_observers = Set.new
-        @readable_observers.extend(MonitorMixin)
-        @writable_observers = Set.new
-        @writable_observers.extend(MonitorMixin)
+        self.io_r, self.io_w = IO.pipe
       end
 
       def push(obj, nonblock = false)
@@ -132,7 +76,7 @@ module Rbgo
                       deq_mutex.synchronize do
                         # no op
                       end
-                      notify_readable_observers
+                      notify
                     end
                   rescue Exception => ex
                     STDERR.puts ex
@@ -175,7 +119,7 @@ module Rbgo
 
           while resource_array.empty? && !closed?
             self.have_deq_waiting_flag = true
-            notify_writable_observers
+            notify
             enq_cond.wait(deq_mutex)
           end
           resource = resource_array.first
@@ -195,8 +139,7 @@ module Rbgo
           self.close_flag = true
           enq_cond.broadcast
           deq_cond.broadcast
-          notify_readable_observers
-          notify_writable_observers
+          notify
           self
         end
       end
@@ -245,17 +188,13 @@ module Rbgo
 
       def initialize(max)
         super(max)
-        @readable_observers = Set.new
-        @readable_observers.extend(MonitorMixin)
-        @writable_observers = Set.new
-        @writable_observers.extend(MonitorMixin)
-
-        @mutex = Mutex.new
+        self.io_r, self.io_w = IO.pipe
+        @mutex               = Mutex.new
       end
 
       def push(obj, nonblock = false)
         super(obj, nonblock)
-        notify_readable_observers
+        notify
         self
       rescue ThreadError
         raise ClosedQueueError.new if closed?
@@ -269,7 +208,7 @@ module Rbgo
           ok  = false if empty? && closed?
           begin
             res = super(nonblock)
-            notify_writable_observers
+            notify
           rescue ThreadError
             raise unless closed?
             ok = false
@@ -280,15 +219,14 @@ module Rbgo
 
       def clear
         super
-        notify_writable_observers
+        notify
         self
       end
 
       def close
         @mutex.synchronize do
           super
-          notify_readable_observers
-          notify_writable_observers
+          notify
           self
         end
       end
@@ -311,10 +249,11 @@ module Rbgo
     def select_chan(*ops)
       ops.shuffle!
 
-      mutex = Mutex.new
-      cond  = ConditionVariable.new
-
-      loop do
+      while true do
+        ios = []
+        ops.each do |op|
+          ios << op.io
+        end
 
         ops.each do |op|
           begin
@@ -325,20 +264,7 @@ module Rbgo
 
         return yield if block_given?
 
-        ops.each do |op|
-          op.register(cond)
-        end
-
-        mutex.synchronize do
-          cond.wait mutex
-        end
-
-      end
-
-    ensure
-
-      ops.each do |op|
-        op.unregister(cond)
+        IO.select(ios)
       end
 
     end
@@ -358,11 +284,8 @@ module Rbgo
           blk.call(res, ok)
         end
       end
-      op.define_singleton_method(:register) do |cond|
-        chan.send :register, observer: cond, mode: :r
-      end
-      op.define_singleton_method(:unregister) do |cond|
-        chan.send :unregister, observer: cond, mode: :r
+      op.define_singleton_method(:io) do
+        chan.send :io_r
       end
       op
     end
@@ -381,11 +304,8 @@ module Rbgo
         res
       end
 
-      op.define_singleton_method(:register) do |cond|
-        chan.send :register, observer: cond, mode: :w
-      end
-      op.define_singleton_method(:unregister) do |cond|
-        chan.send :unregister, observer: cond, mode: :w
+      op.define_singleton_method(:io) do
+        chan.send :io_r
       end
       op
     end

data/lib/rbgo/version.rb

@@ -1,3 +1,3 @@
 module Rbgo
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbgo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Wang Yin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-cpu