prelude-correlator/master: Implement new Timer utility methods

[email protected] Thu, 9 Jul 2009 17:57:27 +0200 (CEST)
Newsgroups gmane.comp.security.ids.prelude.cvs
Message-ID <[email protected]>
commit a61959b597a3bc942fc912ac28040b8e3cb57dcd
Author: Yoann Vandoorselaere <yoann@nobody.(none)>
Date:   Wed Jun 24 08:43:13 2009 +0200

    Implement new Timer utility methods
    
    This implement some Timer utility methods: elapsed() return the number
    of second elapsed since the timer started, hasExpired() return True
    or False depending on whether the timer already expired or not, and
    check() will call the timer callback if the timer has expired.


========================================

 PreludeCorrelator/context.py |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

========================================

diff --git a/PreludeCorrelator/context.py b/PreludeCorrelator/context.py
index bde0b0d..0c91993 100644
--- a/PreludeCorrelator/context.py
+++ b/PreludeCorrelator/context.py
@@ -42,6 +42,16 @@ class Timer:
                 except:
                         pass
 
+        def hasExpired(self, now=time.time()):
+                return self.elapsed(now) >= self._expire
+
+        def check(self, now=time.time()):
+                if self.hasExpired(now):
+                        self._timerExpireCallback()
+
+        def elapsed(self, now=time.time()):
+                return now - self._start
+
         def running(self):
                 return self._start != None
 
@@ -133,9 +143,7 @@ def load():
 
 def wakeup(now):
         for timer in _TIMER_LIST:
-                if now - timer._start >= timer._expire:
-                        timer._timerExpireCallback()
-
+                timer.check(now)
 
 def stats(logger):
         now = time.time()
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog