X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/226118cbaed9b2f092e2ae764260bf3b63951938..fce36f5a8b88722b94b7c60266fb0fc72b2bc10c:/waker.py

diff --git a/waker.py b/waker.py
index 9c2cf06..79eff81 100644
--- a/waker.py
+++ b/waker.py
@@ -1,23 +1,27 @@
 from libtuer import ThreadRepeater
-from collections import namedtuple
 from threading import Lock
 
 SLEEP_TIME = 0.5
 
-ToBeWoken = namedtuple('ToBeWoken','f period time_since_call one_shot')
+class ToBeWoken:
+	'''a simple struct storing information about a to-be-woken function'''
+	def __init__(self, f, period, one_shot):
+		self.f = f
+		self.period = period
+		self.time_since_call = 0
+		self.one_shot = one_shot
 
 class Waker():
-	def __init__(self, sm):
-		self._sm = sm
-		self._t = ThreadRepeater(self._wake, SLEEP_TIME, name="Waker")
+	def __init__(self):
 		self._tobewokens = []
 		self._tobewokens_lock = Lock()
+		self._t = ThreadRepeater(self._wake, SLEEP_TIME, name="Waker")
 	
-	def register(f, time, one_shot = False):
+	def register(self, f, time, one_shot = False):
 		'''Register a function which is called approximately every <time> seconds (or just once, if one_shot is True). f should return quickly, or it will delay the waker!'''
 		time = max(time//SLEEP_TIME, 1)
 		with self._tobewokens_lock:
-			self._tobewokens.append(ToBeWoken(f, time, 0, one_shot))
+			self._tobewokens.append(ToBeWoken(f, time, one_shot))
 	
 	def _wake(self):
 		with self._tobewokens_lock: