wires 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b54cd8c5d2566dc1df5dbbba359680e290cb44
-  data.tar.gz: 32392ed09eae7079456c55ace22840b5d504aa55
+  metadata.gz: 457cb2ed2bd4af2a473bdd857e373aee0d3d9266
+  data.tar.gz: 2f55be33795d9bccd37e7d90afe95ca0387ceb32
 SHA512:
-  metadata.gz: ec3dc587a26c0373cb9b8fd9872208608b6bb5a3f2445dcfd398623ab108b1e7da3205864cb0e15d6911a982ec9ad594e5e06d3975b1bbde075a03532037a3f6
-  data.tar.gz: 5264ed0c4c84c2063e62e32876b1e40acd38587e52e9c40af05bb301ed9e381555c3d7a3fe588a4b0f48fedf149b44235b54db533d107db0054139844ca97798
+  metadata.gz: 396cc5c23cb7b7b0e8cd9c52fa9b438310593dd03ba96e4eaf5731b7d7e1933326a31a89d35cc453301f3746016ec1806e39be2afba08f7c8f09c988c44e0097
+  data.tar.gz: dafd5997b103c258f9fd3776c4eb9f62d11d28c41f0b389e95df7f45827492f9035d5389b140e7edb1d2cdb6a2ce4c151cc3f8ecd096b05ea5c580c2c2f3de73

data/lib/wires/hub.rb

@@ -7,7 +7,7 @@ def puts(x) $stdout.puts(x) end
 # get called in new threads in the order received
 class Hub
   @queue = Queue.new
-  @running = false
+  @state = [:dead, :alive, :dying][0]
   
   @before_kills = Queue.new
   @after_kills  = Queue.new
@@ -15,13 +15,17 @@ class Hub
   # Operate on the metaclass as a type of singleton pattern
   class << self
     
-    def running?; @running; end
+    def dead?;  @state==:dead  end
+    def alive?; @state==:alive end
+    def dying?; @state==:dying end
+    def state;  @state         end
+    
+    def clear;  @queue.clear   end
     
     # Start the Hub event loop in a new thread
     def run
-      if not @running
+      if dead?
         @thread = Thread.new() do
-          @running = true
           self.send(:run_loop)
         end
         
@@ -31,17 +35,13 @@ class Hub
     
     # Start the Hub event loop in the current thread
     def run_in_place()
-      self.send(:run_loop) unless @running
+      self.send(:run_loop) if dead?
     nil end
     
     # Kill the Hub event loop (softly)
-    def kill(); 
-      # Call the before kill hooks
-      while not @before_kills.empty?
-        @before_kills.shift.call
-      end
+    def kill()
       # Stop the main event loop
-      @running=false;
+      @state=:dying;
     end
     
     # Register hook to execute before kill - can call multiple times
@@ -64,7 +64,7 @@ class Hub
     
     # Put x in the queue, and block until x is processed (if Hub is running)
     def fire(x)
-      if @running # yield to event loop thread until awoken by it later
+      if not dead? # yield to event loop thread until awoken by it later
         @queue << [x, Thread.current]
         sleep
       else        # don't wait if Hub isn't running - would cause lockup
@@ -74,13 +74,23 @@ class Hub
     def <<(x); fire(x); end
     
   private
+  
+    def die
+      # Call the before kill hooks # TODO move
+      while not @before_kills.empty?
+        @before_kills.shift.call
+      end
+      @state = :dead
+    end
     
     def run_loop
-      @running = true
+      @state = :alive
         
-      while @running
+      while not dead?
         if @queue.empty? then sleep(0)
         else process_item(@queue.shift) end
+        
+        if dying?; die_thread ||= Thread.new { die } end
       end
       
       while not @after_kills.empty?
@@ -98,7 +108,7 @@ class Hub
           waiting_thread.wakeup if blocking and waiting_thread
           
         rescue Interrupt, SystemExit => e
-          @running = false
+          @state = :dying
           unhandled_exception(e)
           
         rescue Exception => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Joe McIlvain