Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Add cmdline information to CPU usage stats in get_cpu_stats() function and display it in the System page's ffmpeg table with a copy-to-clipboard button (#6430)

Browse Source
This commit is contained in:
Sergey Krashevich 2023-05-15 15:39:03 +03:00 committed by GitHub
parent 181b53a55d
commit 5fb96c777a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frigate/util.py
View File

@ -800,10 +800,11 @@ def get_cpu_stats() -> dict[str, dict]:
docker_memlimit = get_docker_memlimit_bytes() / 1024 docker_memlimit = get_docker_memlimit_bytes() / 1024
total_mem = os.sysconf("SC_PAGE_SIZE") * os.sysconf("SC_PHYS_PAGES") / 1024 total_mem = os.sysconf("SC_PAGE_SIZE") * os.sysconf("SC_PHYS_PAGES") / 1024
for process in psutil.process_iter(["pid", "name", "cpu_percent"]): for process in psutil.process_iter(["pid", "name", "cpu_percent", "cmdline"]):
pid = process.info["pid"] pid = process.info["pid"]
try: try:
cpu_percent = process.info["cpu_percent"] cpu_percent = process.info["cpu_percent"]
cmdline = process.info["cmdline"]
with open(f"/proc/{pid}/stat", "r") as f: with open(f"/proc/{pid}/stat", "r") as f:
stats = f.readline().split() stats = f.readline().split()
@ -837,6 +838,7 @@ def get_cpu_stats() -> dict[str, dict]:
"cpu": str(cpu_percent), "cpu": str(cpu_percent),
"cpu_average": str(round(cpu_average_usage, 2)), "cpu_average": str(round(cpu_average_usage, 2)),
"mem": f"{mem_pct}", "mem": f"{mem_pct}",
"cmdline": " ".join(cmdline),
} }
except: except:
continue continue

10
web/src/routes/System.jsx
View File

@ -347,7 +347,15 @@ export default function System() {
</Thead> </Thead>
<Tbody> <Tbody>
<Tr key="ffmpeg" index="0"> <Tr key="ffmpeg" index="0">
<Td>ffmpeg</Td> <Td>ffmpeg
<Button
className="rounded-full"
type="text"
color="gray"
aria-label={cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cmdline']}
onClick={() => copy(cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cmdline'])}
><About className="w-3" /></Button>
</Td>
<Td>{cameras[camera]['ffmpeg_pid'] || '- '}</Td> <Td>{cameras[camera]['ffmpeg_pid'] || '- '}</Td>
<Td>{cameras[camera]['camera_fps'] || '- '}</Td> <Td>{cameras[camera]['camera_fps'] || '- '}</Td>
<Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cpu'] || '- '}%</Td> <Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cpu'] || '- '}%</Td>