From c43a09bf651fdd87560ed0597cd252f6734a896e Mon Sep 17 00:00:00 2001
From: tom <tom@taco.desk.hq.powerset.com>
Date: Fri, 21 Dec 2007 15:52:10 -0800
Subject: [PATCH] fix potential iteration problem in Timer

---
 History.txt      |  5 +++++
 lib/god/timer.rb | 30 +++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/History.txt b/History.txt
index 34d08b1..863ab62 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,8 @@
+== 0.6.4 / 
+  * Bug Fixes
+    * Refactor Hub to clarify mutexing
+    * Eliminated potential iteration problem in Timer
+
 == 0.6.3 / 2007-12-18
   * Minor Enhancements
     * Output ProcessExits registration/deregistration info
diff --git a/lib/god/timer.rb b/lib/god/timer.rb
index 913267a..8a3d4ce 100644
--- a/lib/god/timer.rb
+++ b/lib/god/timer.rb
@@ -34,25 +34,33 @@ module God
           begin
             # get the current time
             t = Time.now.to_i
-          
+            
             # iterate over each event and trigger any that are due
-            @events.each do |event|
-              if t >= event.at
-                self.trigger(event)
-                @mutex.synchronize do
-                  @events.delete(event)
+            @mutex.synchronize do
+              triggered = []
+              
+              @events.each do |event|
+                if t >= event.at
+                  # trigger the event and mark it for removal
+                  self.trigger(event)
+                  triggered << event
+                else
+                  # events are ordered, so we can bail on first miss
+                  break
                 end
-              else
-                break
+              end
+              
+              # remove all triggered events
+              triggered.each do |event|
+                @events.delete(event)
               end
             end
-          
-            # sleep until next check
-            sleep INTERVAL
           rescue Exception => e
             message = format("Unhandled exception (%s): %s\n%s",
                              e.class, e.message, e.backtrace.join("\n"))
             applog(nil, :fatal, message)
+          ensure
+            # sleep until next check
             sleep INTERVAL
           end
         end
-- 
2.11.4.GIT