rbgo 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a477d7e32124c9fa81f3235d4364a507d3881c560302eb0dab4e1e5dbb47f884
-  data.tar.gz: a4db31caf6709828b837f344f9d54ddd34dda482fda41b1049cf0f11ac3896ed
+  metadata.gz: ce5380534583083998d908ac2ecb726a941bdc1e697cc8b1a6e6e10477e1bec6
+  data.tar.gz: 5eb7fd7557bef0a324a3a9b099e0c53bb2f71110107421d9b017bb42c99c9738
 SHA512:
-  metadata.gz: 955cefbecf82855f6af160d17eceba1f606984d49c3769490f5827d94a8696b3987b17b7eec76e7332838aa38b717dd2370ac726b0b430441b4a7801f8042139
-  data.tar.gz: b2a3f80a70cbf86cca2f65eb828f9867d8109cb18224d58e6bf1d875605cabceb62f1d2dc299e960fd8b7224f39b3ef1b43cd3a42ac4bc250a03508e984af890
+  metadata.gz: 194e1bbd2eee668bf3221db0c2b7dc888dbdf54b1ef2274c06ec51b031250e8858a134d37cf9b9c81c31c8d054723f6ffa3483409c5e642778e6391b7fdd823e
+  data.tar.gz: 7ba0c5eace41ad7d673d536dd6c80e0af03fcc53cdca945a2d2041f699bbcf13dc4ea075770e1302184566b8af80e51dab2fbf3a44f577918aef01db7f6f27a6

data/lib/rbgo/select_chan.rb

@@ -14,12 +14,22 @@ module Rbgo
 
       private
 
-      attr_accessor :io_r, :io_w
+      attr_accessor :ios
+      attr_accessor :register_mutex
+
+      def register(io)
+        register_mutex.synchronize do
+          ios << io
+        end
+      end
 
       def notify
-        tmp                  = io_w
-        self.io_r, self.io_w = IO.pipe
-        tmp.close rescue nil
+        register_mutex.synchronize do
+          ios.each do |io|
+            io.close rescue nil
+          end
+          ios.clear
+        end
         nil
       end
     end
@@ -43,7 +53,8 @@ module Rbgo
         self.have_enq_waiting_flag = false
         self.have_deq_waiting_flag = false
 
-        self.io_r, self.io_w = IO.pipe
+        self.ios = []
+        self.register_mutex = Mutex.new
       end
 
       def push(obj, nonblock = false)
@@ -189,8 +200,10 @@ module Rbgo
 
       def initialize(max)
         super(max)
-        self.io_r, self.io_w = IO.pipe
-        @mutex               = Mutex.new
+        @mutex = Mutex.new
+
+        self.ios = []
+        self.register_mutex = Mutex.new
       end
 
       def push(obj, nonblock = false)
@@ -250,24 +263,49 @@ module Rbgo
     def select_chan(*ops)
       ops.shuffle!
 
-      while true do
-        ios = []
-        ops.each do |op|
-          ios << op.io
+      io_hash      = {}
+      close_io_blk = proc do
+        io_hash.each_pair.flat_map do |k, v|
+          [k, v[1]]
+        end.each do |io|
+          io.close rescue nil
         end
+      end
 
-        ops.each do |op|
-          begin
-            return op.call
-          rescue ThreadError
+      begin
+        while true do
+
+          close_io_blk.call
+          io_hash.clear
+
+          ops.each do |op|
+            io_r, io_w = IO.pipe
+            op.register(io_w)
+            io_hash[io_r] = [op, io_w]
           end
-        end
 
-        return yield if block_given?
+          ops.each do |op|
+            begin
+              return op.call
+            rescue ThreadError
+            end
+          end
 
-        IO.select(ios)
-      end
+          return yield if block_given?
+
+          read_ios = IO.select(io_hash.keys).first rescue []
 
+          read_ios.each do |io_r|
+            op = io_hash[io_r].first
+            begin
+              return op.call
+            rescue ThreadError
+            end
+          end
+        end
+      ensure
+        close_io_blk.call
+      end
     end
 
     # on_read
@@ -285,8 +323,8 @@ module Rbgo
           blk.call(res, ok)
         end
       end
-      op.define_singleton_method(:io) do
-        chan.send :io_r
+      op.define_singleton_method(:register) do |io_w|
+        chan.send :register, io_w
       end
       op
     end
@@ -304,9 +342,8 @@ module Rbgo
         res = blk.call unless blk.nil?
         res
       end
-
-      op.define_singleton_method(:io) do
-        chan.send :io_r
+      op.define_singleton_method(:register) do |io_w|
+        chan.send :register, io_w
       end
       op
     end

data/lib/rbgo/version.rb

@@ -1,3 +1,3 @@
 module Rbgo
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbgo
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Wang Yin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system