3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proc_stats: add CPU throttled flags to log rollover 

Don't continuously log a change in throttled state, only log when a new throttled flag is detected.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-04-22 19:53:18 -04:00
parent b9487276e9
commit 37615d4790
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
moonraker/components/proc_stats.py
View File

@ -10,6 +10,7 @@ import pathlib
import logging import logging
from collections import deque from collections import deque
from tornado.ioloop import IOLoop, PeriodicCallback from tornado.ioloop import IOLoop, PeriodicCallback
from tornado.locks import Lock
VC_GEN_CMD_FILE = "/usr/bin/vcgencmd" VC_GEN_CMD_FILE = "/usr/bin/vcgencmd"
STATM_FILE_PATH = "/proc/self/smaps_rollup" STATM_FILE_PATH = "/proc/self/smaps_rollup"
@ -52,7 +53,8 @@ class ProcStats:
self.proc_stat_queue = deque(maxlen=30) self.proc_stat_queue = deque(maxlen=30)
self.last_update_time = time.time() self.last_update_time = time.time()
self.last_proc_time = time.process_time() self.last_proc_time = time.process_time()
self.throttled = False self.throttle_check_lock = Lock()
self.total_throttled = 0
self.update_sequence = 0 self.update_sequence = 0
self.stat_update_cb.start() self.stat_update_cb.start()
@ -93,25 +95,28 @@ class ProcStats:
self.update_sequence = 0 self.update_sequence = 0
if self.vcgencmd is not None: if self.vcgencmd is not None:
ts = await self._check_throttled_state() ts = await self._check_throttled_state()
cur_throttled = ts['bits'] & 0xF cur_throttled = ts['bits']
if cur_throttled and not self.throttled: if cur_throttled & ~self.total_throttled:
logging.info( self.server.add_log_rollover_item(
f"CPU Throttled State Detected: {ts['flags']}") 'throttled', f"CPU Throttled Flags: {ts['flags']}",
True)
self.need_log = False
self.server.send_event("proc_stats:cpu_throttled", ts) self.server.send_event("proc_stats:cpu_throttled", ts)
self.throttled = cur_throttled self.total_throttled |= cur_throttled
async def _check_throttled_state(self): async def _check_throttled_state(self):
try: async with self.throttle_check_lock:
resp = await self.vcgencmd.run_with_response( try:
timeout=.5, log_complete=False) resp = await self.vcgencmd.run_with_response(
ts = int(resp.strip().split("=")[-1], 16) timeout=.5, log_complete=False)
except Exception: ts = int(resp.strip().split("=")[-1], 16)
return {'bits': 0, 'flags': ["?"]} except Exception:
flags = [] return {'bits': 0, 'flags': ["?"]}
for flag, desc in THROTTLED_FLAGS.items(): flags = []
if flag & ts: for flag, desc in THROTTLED_FLAGS.items():
flags.append(desc) if flag & ts:
return {'bits': ts, 'flags': flags} flags.append(desc)
return {'bits': ts, 'flags': flags}
def _get_memory_usage(self): def _get_memory_usage(self):
try: try: