wires 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed473de572f57451505cf39568dc498f6b2055fc
-  data.tar.gz: 6c6a3f80746359292cd22dd84c26c29b90957ef7
+  metadata.gz: 63192901a598961c0bd3aafa25c6e49da1e4d328
+  data.tar.gz: 5477285e774357f9d62fa7f41088a7ad16f7f90d
 SHA512:
-  metadata.gz: a2c40457ba7ecc2f8120e723fa3a3a13788ffd53c438b55d477c96f32336ec39c7a66cd7e08c7c0d27598c5725a205902e86866c725f5a99503d1aefa70765dd
-  data.tar.gz: d8e3993a55c2b6f4060d0ee1d7fd4df75af8a6ee64d0be1be40a8fc30d15d71fe26d5c18f927526cbaa6bb286d7520014fb674fb3c5606b913143c7c673533fe
+  metadata.gz: 00163b5c1c47e4037c8db05a3338bdaeeca7541dbc0949995f60aa167120c31a2cdd4c23e6100403668dbeb0cb13f93a6a43a08873a019dfc49af42aa1e63f41
+  data.tar.gz: 36a4df0cd53af0005e2459847e44e5220062699e0255ef0c0f904e5ac02a4c8e43928846e6bc78127e4e67d8d98bf4da733bb87b6069b4460af5692b9ea0677b

data/lib/wires/hub.rb

@@ -1,7 +1,5 @@
 
-# Make sure puts goes to $stdout for all threads!
-def puts(x) $stdout.puts(x) end
-
+#TODO: Allow custom grain times
 module Wires
   # An Event Hub. Event/proc associations come in, and the procs 
   # get called in new threads in the order received
@@ -27,25 +25,15 @@ module Wires
         @at_exit = Proc.new{nil}
         at_exit do self.at_exit_proc end
         
-        @fire_proc_alive = Proc.new do |x|
-          @queue << [x, Thread.current]
-          @thread.wakeup
-          sleep
-        end
-        @fire_proc_dead = Proc.new do |x|
-          @queue << [x, nil]
-        end
-        @fire_proc = @fire_proc_dead
-        
         state_machine_init
+        
       nil end
       
-      def at_exit_proc;  @at_exit.call; end
+      def at_exit_proc;  @at_exit.call;  end
       
       # Make subclasses call class_init
-      def inherited(subcls)
-        subcls.class_init
-      end
+      def inherited(subcls); subcls.class_init end
+      
       
       def dead?;  state==:dead  end
       def alive?; state==:alive end
@@ -59,24 +47,30 @@ module Wires
       #               specified, the Hub event loop is run in a new thread, 
       #               which the main thread joins in at_exit.
       def run(*flags)
-        request_state :alive until alive?
+        sleep 0 until request_state :alive
+        sleep 0 until @thread
         
         # If :blocking, block now, else block at exit
         (flags.include? :in_place)   ?
           (@thread.join) :
           (@at_exit = Proc.new { @thread.join if @thread and not $! })
+          
       end
       
       ##
       # Kill the Hub event loop (optional flags change thread behavior)
       #
       # valid flags:
-      # [+:finish_all+] Hub thread won't be done until all child threads done
-      # [+:blocking+] calling thread won't be done until Hub thread is done
+      # [+:nonblocking+]
+      #   Without this flag, calling thread will be blocked
+      #   until Hub thread is done
+      # [+:purge_events+]
+      #   Without this flag, Hub thread won't be done 
+      #   until all child threads are done
       def kill(*flags)
-        @please_finish_all = (flags.include? :finish_all)
+        @please_finish_all = (not flags.include? :purge_events)
         @please_kill = true
-        block_until_state :dead if (flags.include? :blocking)
+        block_until_state :dead unless (flags.include? :nonblocking)
       nil end
       
       # Register hook to execute before run - can call multiple times
@@ -115,11 +109,10 @@ module Wires
         
         @queue << [x, Thread.current]
         (x[2] and @thread) ?
-          sleep            :
+          sleep :
           Thread.pass
         
       nil end
-      # threadlock :fire, lock: :@child_threads_lock
       def <<(x); fire(x); end
       
       def flush_queue
@@ -227,22 +220,22 @@ module Wires
           transition_to :alive do
             before { run_hooks @before_runs }
             after  { run_hooks @after_runs }
-            after  { do_state_tasks }
-            after  { start_hegemon_auto_thread(0.1) }
-            # after  { @fire_proc = @fire_proc_alive }
+            after  { start_hegemon_auto_thread(0.05) }
           end
         end
         
         declare_state :alive do
           
           task do |i|
-            
-            @thread = Thread.new do
-              while true
-                if @queue.empty? then sleep 0.1
-                else process_item(@queue.shift) end
+            if i==0
+              @thread_continue = true
+              @thread = Thread.new do
+                while @thread_continue
+                  if @queue.empty? then sleep 0.01
+                  else process_item(@queue.shift) end
+                end
               end
-            end if i==0
+            end
             
           end
           
@@ -253,17 +246,16 @@ module Wires
             
             before { join_children if @please_finish_all }
             
-            after  { @thread.kill; @thread = nil}
+            after  { @thread_continue=false
+                     @thread.join
+                     @thread = nil }
             
             after  { @please_kill = false }
             after  { @please_finish_all = false }
             
             after  { run_hooks @after_kills }
             
-            # after  { @fire_proc = @fire_proc_dead }
-            
             after  { end_hegemon_auto_thread }
-            after  { do_state_tasks }
           end
         end
         

data/lib/wires/time.rb

@@ -135,7 +135,6 @@ module Wires
                  :schedule_pull,
            lock: :@schedule_lock
       
-      # Do scheduled firing of events as long as Hub is alive
       def main_loop
         
         @keepgoing = true
@@ -174,16 +173,18 @@ module Wires
     # on :time_scheduler_start, self do; main_loop; end;
     # Channel.new(self).fire(:time_scheduler_start)
     
+    # Refire the start event after Hub dies in case it restarts
+    Hub.after_run(retain:true) do 
+      @thread = Thread.new { main_loop }
+    end
+    
     # Stop the main loop upon death of Hub
     Hub.before_kill(retain:true) do 
       sleep 0 until @sleepzone==true
+      sleep 0 until @thread.status=='sleep'
       @keepgoing=false
       wakeup
-    end
-    
-    # Refire the start event after Hub dies in case it restarts
-    Hub.after_run(retain:true) do 
-      @thread = Thread.new { main_loop }
+      @thread.join
     end
     
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement