pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't close serial port before switching to state "closed serial port"

Browse source 
Depending on what was happening in the monitoring thread this could lead to an attempt to write to the already closed port, logging an error and killing the interface in the process. Also fixed a timing issue in the state reporting towards the frontend, state updates and readings for clients are now wrapped in a mutex

Closes #492
This commit is contained in:
Gina Häußge 2014-08-07 18:07:19 +02:00
parent c026d7d248
commit 11fb18f598
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/octoprint/printer.py
View file

@ -688,6 +688,7 @@ class StateMonitor(object):
self._offsets = {} self._offsets = {}
self._changeEvent = threading.Event() self._changeEvent = threading.Event()
self._stateMutex = threading.Lock()
self._lastUpdate = time.time() self._lastUpdate = time.time()
self._worker = threading.Thread(target=self._work) self._worker = threading.Thread(target=self._work)
@ -717,8 +718,9 @@ class StateMonitor(object):
self._changeEvent.set() self._changeEvent.set()
def setState(self, state): def setState(self, state):
self._state = state with self._stateMutex:
self._changeEvent.set() self._state = state
self._changeEvent.set()
def setJobData(self, jobData): def setJobData(self, jobData):
self._jobData = jobData self._jobData = jobData
@ -736,16 +738,17 @@ class StateMonitor(object):
while True: while True:
self._changeEvent.wait() self._changeEvent.wait()
now = time.time() with self._stateMutex:
delta = now - self._lastUpdate now = time.time()
additionalWaitTime = self._ratelimit - delta delta = now - self._lastUpdate
if additionalWaitTime > 0: additionalWaitTime = self._ratelimit - delta
time.sleep(additionalWaitTime) if additionalWaitTime > 0:
time.sleep(additionalWaitTime)
data = self.getCurrentData() data = self.getCurrentData()
self._updateCallback(data) self._updateCallback(data)
self._lastUpdate = time.time() self._lastUpdate = time.time()
self._changeEvent.clear() self._changeEvent.clear()
def getCurrentData(self): def getCurrentData(self):
return { return {

2
src/octoprint/util/comm.py
View file

@ -340,11 +340,11 @@ class MachineCom(object):
def close(self, isError = False): def close(self, isError = False):
printing = self.isPrinting() or self.isPaused() printing = self.isPrinting() or self.isPaused()
if self._serial is not None: if self._serial is not None:
self._serial.close()
if isError: if isError:
self._changeState(self.STATE_CLOSED_WITH_ERROR) self._changeState(self.STATE_CLOSED_WITH_ERROR)
else: else:
self._changeState(self.STATE_CLOSED) self._changeState(self.STATE_CLOSED)
self._serial.close()
self._serial = None self._serial = None
if settings().get(["feature", "sdSupport"]): if settings().get(["feature", "sdSupport"]):