mirror of
https://github.com/Klipper3d/klipper.git
synced 2025-10-26 07:46:11 +01:00
statistics: Verify nothing attempts to pause in a stats() callback
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
@@ -52,7 +52,7 @@ class PrinterSysStats:
|
|||||||
class PrinterStats:
|
class PrinterStats:
|
||||||
def __init__(self, config):
|
def __init__(self, config):
|
||||||
self.printer = config.get_printer()
|
self.printer = config.get_printer()
|
||||||
reactor = self.printer.get_reactor()
|
self.reactor = reactor = self.printer.get_reactor()
|
||||||
self.stats_timer = reactor.register_timer(self.generate_stats)
|
self.stats_timer = reactor.register_timer(self.generate_stats)
|
||||||
self.stats_cb = []
|
self.stats_cb = []
|
||||||
self.printer.register_event_handler("klippy:ready", self.handle_ready)
|
self.printer.register_event_handler("klippy:ready", self.handle_ready)
|
||||||
@@ -60,9 +60,9 @@ class PrinterStats:
|
|||||||
self.stats_cb = [o.stats for n, o in self.printer.lookup_objects()
|
self.stats_cb = [o.stats for n, o in self.printer.lookup_objects()
|
||||||
if hasattr(o, 'stats')]
|
if hasattr(o, 'stats')]
|
||||||
if self.printer.get_start_args().get('debugoutput') is None:
|
if self.printer.get_start_args().get('debugoutput') is None:
|
||||||
reactor = self.printer.get_reactor()
|
self.reactor.update_timer(self.stats_timer, self.reactor.NOW)
|
||||||
reactor.update_timer(self.stats_timer, reactor.NOW)
|
|
||||||
def generate_stats(self, eventtime):
|
def generate_stats(self, eventtime):
|
||||||
|
with self.reactor.assert_no_pause():
|
||||||
stats = [cb(eventtime) for cb in self.stats_cb]
|
stats = [cb(eventtime) for cb in self.stats_cb]
|
||||||
if max([s[0] for s in stats]):
|
if max([s[0] for s in stats]):
|
||||||
stats_str = ' '.join([s[1] for s in stats if s[1]])
|
stats_str = ' '.join([s[1] for s in stats if s[1]])
|
||||||
|
|||||||
Reference in New Issue
Block a user