Skip to content

Fix arm system cpu frequency retrieval #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-clan merged 6 commits into from
Aug 21, 2024
Merged

Fix arm system cpu frequency retrieval #385

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca2211f
Fix: Disable CPU frequency retrieval on macOS systems with Apple Sili…
Aug 19, 2024
d7d457a
Fix: Disable CPU frequency retrieval on macOS systems with Apple Sili…
Aug 19, 2024
50d9474
Merge remote-tracking branch 'origin/master'
Aug 20, 2024
2a10041
Merge remote-tracking branch 'origin/master'
Aug 20, 2024
4fa203e
Merge remote-tracking branch 'origin/master'
Aug 20, 2024
f0469f0
Fix: Solve the single quote problem
Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions backend/utils/server_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,22 @@ def get_cpu_info() -> dict:
"""获取 CPU 信息"""
cpu_info = {'usage': round(psutil.cpu_percent(interval=1, percpu=False), 2)} # %

# CPU 频率信息，最大、最小和当前频率
cpu_freq = psutil.cpu_freq()
cpu_info['max_freq'] = round(cpu_freq.max, 2) # MHz
cpu_info['min_freq'] = round(cpu_freq.min, 2) # MHz
cpu_info['current_freq'] = round(cpu_freq.current, 2) # MHz
# 检查是否是 Apple M1/M2/M3 芯片
Comment thread
wu-clan marked this conversation as resolved.
Outdated
if platform.system() == "Darwin" and "arm" in platform.machine().lower():
cpu_info['max_freq'] = None
cpu_info['min_freq'] = None
cpu_info['current_freq'] = None
Comment thread
wu-clan marked this conversation as resolved.
Outdated
else:
try:
# CPU 频率信息，最大、最小和当前频率
cpu_freq = psutil.cpu_freq()
cpu_info['max_freq'] = round(cpu_freq.max, 2) # MHz
cpu_info['min_freq'] = round(cpu_freq.min, 2) # MHz
cpu_info['current_freq'] = round(cpu_freq.current, 2) # MHz
except FileNotFoundError:
cpu_info['max_freq'] = None
cpu_info['min_freq'] = None
cpu_info['current_freq'] = None
Comment thread
yshan2028 marked this conversation as resolved.
Outdated

# CPU 逻辑核心数，物理核心数
cpu_info['logical_num'] = psutil.cpu_count(logical=True)
Expand Down