From 801f9adfd7d60221deb49ea39708393aa8b9f9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 4 Mar 2015 10:20:13 +0100
Subject: [PATCH] Further experiments with send_queue and polling timers

---
 src/octoprint/util/__init__.py |  8 ++++++-
 src/octoprint/util/comm.py     | 43 ++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py
index ea3fcc23..37ede237 100644
--- a/src/octoprint/util/__init__.py
+++ b/src/octoprint/util/__init__.py
@@ -532,7 +532,10 @@ def address_for_client(host, port):
 
 class CountedEvent(object):
 
-	def __init__(self, value=0, max=None):
+	def __init__(self, value=0, max=None, name=None):
+		logger_name = __name__ + ".CountedEvent" + ("[{name}]".format(name=name) if name is not None else "")
+		self._logger = logging.getLogger(logger_name)
+
 		self._counter = 0
 		self._max = max
 		self._mutex = threading.Lock()
@@ -559,11 +562,14 @@ class CountedEvent(object):
 			return self._counter == 0
 
 	def _internal_set(self, value):
+		self._logger.debug("New counter value: {value}".format(value=value))
 		self._counter = value
 		if self._counter <= 0:
 			self._counter = 0
 			self._event.clear()
+			self._logger.debug("Cleared event")
 		else:
 			if self._max is not None and self._counter > self._max:
 				self._counter = self._max
 			self._event.set()
+			self._logger.debug("Set event")
diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
index 98a7c0ba..a33d2d69 100644
--- a/src/octoprint/util/comm.py
+++ b/src/octoprint/util/comm.py
@@ -162,7 +162,7 @@ class MachineCom(object):
 		self._lastResendNumber = None
 		self._currentResendCount = 0
 
-		self._clear_to_send = CountedEvent(max=10)
+		self._clear_to_send = CountedEvent(max=10, name="comm.clear_to_send")
 		self._send_queue = queue.Queue()
 		self._sd_status_timer = None
 		self._temperature_timer = None
@@ -211,12 +211,12 @@ class MachineCom(object):
 		self._sendingLock = threading.Lock()
 
 		# monitoring thread
-		self.monitoring_thread = threading.Thread(target=self._monitor)
+		self.monitoring_thread = threading.Thread(target=self._monitor, name="comm._monitor")
 		self.monitoring_thread.daemon = True
 		self.monitoring_thread.start()
 
 		# sending thread
-		self.sending_thread = threading.Thread(target=self._send_loop)
+		self.sending_thread = threading.Thread(target=self._send_loop, name="comm.sending_thread")
 		self.sending_thread.daemon = True
 		self.sending_thread.start()
 
@@ -1044,7 +1044,8 @@ class MachineCom(object):
 				elif self._state == self.STATE_PRINTING:
 					if line == "" and time.time() > self._timeout:
 						self._log("Communication timeout during printing, forcing a line")
-						line = 'ok'
+						#line = 'ok'
+						self._clear_to_send.set()
 
 					if "ok" in line:
 						if swallowOk:
@@ -1096,15 +1097,29 @@ class MachineCom(object):
 
 	def _send_loop(self):
 		while True:
-			self._clear_to_send.wait()
-			command, linenumber = self._send_queue.get()
-			if linenumber is not None:
-				self._doSendWithChecksum(command, linenumber)
-			else:
-				self._doSendWithoutChecksum(command)
+			if self._send_queue.qsize() == 0:
+				# queue is empty, wait a bit before checking again
+				time.sleep(0.1)
+				continue
+
+			try:
+				entry = self._send_queue.get(block=False)
+			except queue.Empty:
+				entry = None
+
+			if entry is not None:
+				command, linenumber = entry
+				if linenumber is not None:
+					self._doSendWithChecksum(command, linenumber)
+				else:
+					self._doSendWithoutChecksum(command)
+				self._clear_to_send.clear()
+				self._clear_to_send.wait()
 
 	def _poll_temperature(self):
-		if self.isOperational() and not self.isStreaming() and self._heatupWaitStartTime is None:
+		print("temperature poll timer hit")
+		if self.isOperational() and not self.isStreaming() and not self._heatupWaitStartTime:
+			print("sending temperature poll")
 			self.sendCommand("M105")
 
 		interval = get_interval("temperature")
@@ -1112,11 +1127,13 @@ class MachineCom(object):
 		self._temperature_timer.start()
 
 	def _poll_sd_status(self):
-		if self.isOperational() and self.isSdPrinting() and self._heatupWaitStartTime is None:
+		print("sd status poll timer hit")
+		if self.isOperational() and self.isSdPrinting() and not self._heatupWaitStartTime:
+			print("sending sd status poll")
 			self.sendCommand("M27")
 
 		interval = get_interval("sdStatus")
-		self._sd_status_timer = threading.Timer(interval, self._poll_temperature)
+		self._sd_status_timer = threading.Timer(interval, self._poll_sd_status)
 		self._sd_status_timer.start()
 
 	def _onConnected(self):