open4 0.5.0 → 0.5.1

data/a.rb

@@ -0,0 +1,64 @@
+require 'thread'
+
+class ThreadEnsemble
+#--{{{
+  attr 'threads'
+
+  def initialize
+    @threads, @argv, @done, @running = [], [], Queue.new, false
+  end
+
+  def add_thread *a, &b
+    @running ? raise : (@argv << [a, b])
+  end
+
+  def killall
+    (@threads - [Thread.current]).each{|t| t.kill rescue nil} if @running
+  end
+
+  def run
+    @running = true
+
+    begin
+      @argv.each do |a, b|
+        @threads << Thread.new(*a) do |*a|
+          begin
+            b[*a]
+          ensure
+            killall rescue nil if $!
+            @done.push Thread.current
+          end
+        end
+      end
+    rescue
+      killall
+      raise
+    ensure
+      all_done
+    end
+
+    @threads.map{|t| t.value}
+  end
+
+  def all_done
+    @threads.size.times{ @done.pop }
+  end
+#--}}}
+end
+
+loop do
+  te = ThreadEnsemble.new
+
+  1000.times do
+    te.add_thread do
+      raise
+    end
+  end
+
+  begin
+    te.run
+  rescue
+    running = te.threads.select{|t| t.status} 
+    abort running.inspect if running.size > 0
+  end
+end

data/lib/{open4-0.5.0.rb → open4-0.5.1.rb}

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -101,45 +101,46 @@ module Open4
 
   class ThreadEnsemble
 #--{{{
+    attr 'threads'
+
     def initialize
-      @group = ThreadGroup.new
-      @kill = Queue.new
-      @killer = Thread.new{ k = @kill.pop and others.map{|t| t.kill unless t == k rescue next}}
-      @running = false
+      @threads, @argv, @done, @running = [], [], Queue.new, false
     end
 
     def add_thread *a, &b
-      raise if @running
-      @group.add(Thread.new(*a) do |*a|
-        Thread.stop
-        begin
-          b[*a]
-        ensure
-          kill if $!
-        end
-      end)
+      @running ? raise : (@argv << [a, b])
     end
 
-    def kill
-      @kill.push Thread.current
+    def killall
+      (@threads - [Thread.current]).each{|t| t.kill rescue nil} if @running
     end
 
-    def others
-      threads - [Thread.current]
-    end
+    def run
+      @running = true
 
-    def threads
-      @group.list
-    end
+      begin
+        @argv.each do |a, b|
+          @threads << Thread.new(*a) do |*a|
+            begin
+              b[*a]
+            ensure
+              killall rescue nil if $!
+              @done.push Thread.current
+            end
+          end
+        end
+      rescue
+        killall
+        raise
+      ensure
+        all_done
+      end
 
-    def value
-      others.map{|t| t.value}
+      @threads.map{|t| t.value}
     end
 
-    def run
-      @running = true
-      others.map{|t| t.wakeup}
-      value
+    def all_done
+      @threads.size.times{ @done.pop }
     end
 #--}}}
   end

data/lib/open4.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 module Open4
 #--{{{
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -101,45 +101,46 @@ module Open4
 
   class ThreadEnsemble
 #--{{{
+    attr 'threads'
+
     def initialize
-      @group = ThreadGroup.new
-      @kill = Queue.new
-      @killer = Thread.new{ k = @kill.pop and others.map{|t| t.kill unless t == k rescue next}}
-      @running = false
+      @threads, @argv, @done, @running = [], [], Queue.new, false
     end
 
     def add_thread *a, &b
-      raise if @running
-      @group.add(Thread.new(*a) do |*a|
-        Thread.stop
-        begin
-          b[*a]
-        ensure
-          kill if $!
-        end
-      end)
+      @running ? raise : (@argv << [a, b])
     end
 
-    def kill
-      @kill.push Thread.current
+    def killall
+      (@threads - [Thread.current]).each{|t| t.kill rescue nil} if @running
     end
 
-    def others
-      threads - [Thread.current]
-    end
+    def run
+      @running = true
 
-    def threads
-      @group.list
-    end
+      begin
+        @argv.each do |a, b|
+          @threads << Thread.new(*a) do |*a|
+            begin
+              b[*a]
+            ensure
+              killall rescue nil if $!
+              @done.push Thread.current
+            end
+          end
+        end
+      rescue
+        killall
+        raise
+      ensure
+        all_done
+      end
 
-    def value
-      others.map{|t| t.value}
+      @threads.map{|t| t.value}
     end
 
-    def run
-      @running = true
-      others.map{|t| t.wakeup}
-      value
+    def all_done
+      @threads.size.times{ @done.pop }
     end
 #--}}}
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: open4
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2006-08-07 00:00:00.000000 -06:00
+  version: 0.5.1
+date: 2006-08-22 00:00:00.000000 -06:00
 summary: open4
 require_paths: 
   - lib
@@ -36,6 +36,8 @@ files:
   - build
   - install
   - gemspec.rb
+  - a.rb
+  - open4-0.5.1.gem
   - sample/block.rb
   - sample/simple.rb
   - sample/exception.rb
@@ -44,7 +46,7 @@ files:
   - sample/timeout.rb
   - sample/stdin_timeout.rb
   - lib/open4.rb
-  - lib/open4-0.5.0.rb
+  - lib/open4-0.5.1.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []