Druk-3D/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-10-26 07:46:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

gcode_macro: Verify nothing attempts to pause in a get_status() callback

Browse Source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2025-10-18 13:05:54 -04:00
parent ff667075cf
commit 6465921a5a
2 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
klippy/extras/gcode_macro.py
View File

@@ -24,9 +24,12 @@ class GetStatusWrapper:
po = self.printer.lookup_object(sval, None) po = self.printer.lookup_object(sval, None)
if po is None or not hasattr(po, 'get_status'): if po is None or not hasattr(po, 'get_status'):
raise KeyError(val) raise KeyError(val)
reactor = self.printer.get_reactor()
if self.eventtime is None: if self.eventtime is None:
self.eventtime = self.printer.get_reactor().monotonic() self.eventtime = reactor.monotonic()
self.cache[sval] = res = copy.deepcopy(po.get_status(self.eventtime)) with reactor.assert_no_pause():
sts = po.get_status(self.eventtime)
self.cache[sval] = res = copy.deepcopy(sts)
return res return res
def __contains__(self, val): def __contains__(self, val):
try: try:

3
klippy/webhooks.py
View File

@@ -491,6 +491,8 @@ class QueryStatusHelper:
self.pending_queries = [] self.pending_queries = []
msglist.extend(self.clients.values()) msglist.extend(self.clients.values())
# Generate get_status() info for each client # Generate get_status() info for each client
reactor = self.printer.get_reactor()
with reactor.assert_no_pause():
for cconn, subscription, send_func, template in msglist: for cconn, subscription, send_func, template in msglist:
is_query = cconn is None is_query = cconn is None
if not is_query and cconn.is_closed(): if not is_query and cconn.is_closed():
@@ -525,7 +527,6 @@ class QueryStatusHelper:
send_func(tmp) send_func(tmp)
if not query: if not query:
# Unregister timer if there are no longer any subscriptions # Unregister timer if there are no longer any subscriptions
reactor = self.printer.get_reactor()
reactor.unregister_timer(self.query_timer) reactor.unregister_timer(self.query_timer)
self.query_timer = None self.query_timer = None
return reactor.NEVER return reactor.NEVER