Skip to content
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.

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

[bug] get_cpus is not supporting cgroup2 #11635 #11667

Merged
merged 2 commits into from Jul 22, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions conan/tools/build/cpu.py
@@ -1,5 +1,6 @@
import math
import multiprocessing
import os

from conans.util.files import load

Expand All @@ -15,8 +16,18 @@ def _cpu_count():
try:
try:
# This is necessary to deduce docker cpu_count
cfs_quota_us = int(load("/sys/fs/cgroup/cpu/cpu.cfs_quota_us"))
cfs_period_us = int(load("/sys/fs/cgroup/cpu/cpu.cfs_period_us"))
cfs_quota_us = cfs_period_us = 0
# cgroup2
if os.path.exists("/sys/fs/cgroup/cgroup.controllers"):
cpu_max = load("/sys/fs/cgroup/cpu.max").split()
if cpu_max[0] != "max":
if len(cpu_max) == 1:
cfs_quota_us, cfs_period_us = int(cpu_max[0]), 100_000
else:
cfs_quota_us, cfs_period_us = map(int, cpu_max)
else: # cgroup1
cfs_quota_us = int(load("/sys/fs/cgroup/cpu/cpu.cfs_quota_us"))
cfs_period_us = int(load("/sys/fs/cgroup/cpu/cpu.cfs_period_us"))
if cfs_quota_us > 0 and cfs_period_us > 0:
return int(math.ceil(cfs_quota_us / cfs_period_us))
except (EnvironmentError, TypeError):
Expand Down