optimization of 'Sender' class

Author: SkypLabs

hdlcontroller.py

@@ -153,14 +153,19 @@ def __init__(self, write_func, send_lock, data, seq_no, timeout=2, callback=None
 			self.seq_no = seq_no
 			self.timeout = timeout
 			self.callback = callback
-			self.ack = Event()
+
+			self.stop_sender = Event()
+			self.stop_timeout = Event()
+			self.next_timeout = 0
 
 		def run(self):
-			with self.send_lock:
-				self.__send_data()
+			while not self.stop_sender.isSet():
+				self.stop_timeout.wait(max(0, self.next_timeout - time()))
+				self.stop_timeout.clear()
+
+				if not self.stop_sender.isSet():
+					self.next_timeout = time() + self.timeout
 
-			while not self.ack.isSet():
-				if time() >= self.next_timeout:
 					with self.send_lock:
 						self.__send_data()
 
@@ -169,7 +174,8 @@ def join(self, timeout=None):
 			Stop the current thread.
 			"""
 
-			self.ack.set()
+			self.stop_sender.set()
+			self.stop_timeout.set()
 			super().join(timeout)
 
 		def ack_received(self):
@@ -190,8 +196,7 @@ def nack_received(self):
 			frame.
 			"""
 
-			with self.send_lock:
-				self.__send_data()
+			self.stop_timeout.set()
 
 		def __send_data(self):
 			"""
@@ -202,7 +207,6 @@ def __send_data(self):
 				self.callback(self.data)
 
 			self.write(frame_data(self.data, FRAME_DATA, self.seq_no))
-			self.next_timeout = time() + self.timeout
 
 	class Receiver(Thread):
 		"""
@@ -217,6 +221,7 @@ def __init__(self, read_func, write_func, send_lock, senders_list, frames_receiv
 			self.senders = senders_list
 			self.frames_received = frames_received
 			self.callback = callback
+
 			self.stop_receiver = Event()
 
 		def run(self):