summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-06-18 09:43:52 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-06-18 09:43:52 +0000
commit405e0f3b98ccc84c77dc8d68691e277bf82ae495 (patch)
tree592fe8e7ad9861ed6e7de7ae490405dfef29d70c
parent0a83e87c9dd2cd250ff157fa0e4283fee2f47c26 (diff)
parent2e9fcce77520644ad08eda84badc48c07879ce11 (diff)
downloadbuildstream-405e0f3b98ccc84c77dc8d68691e277bf82ae495.tar.gz
Merge branch 'aevri/psutil_affinity' into 'master'
_platform.get_cpu_count: use psutil instead of os See merge request BuildStream/buildstream!1394
-rw-r--r--src/buildstream/_platform/platform.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/buildstream/_platform/platform.py b/src/buildstream/_platform/platform.py
index dba60ddca..0fbe145f9 100644
--- a/src/buildstream/_platform/platform.py
+++ b/src/buildstream/_platform/platform.py
@@ -22,6 +22,8 @@ import platform
import sys
import resource
+import psutil
+
from .._exceptions import PlatformError, ImplError
@@ -68,7 +70,7 @@ class Platform():
return cls._instance
def get_cpu_count(self, cap=None):
- cpu_count = len(os.sched_getaffinity(0))
+ cpu_count = len(psutil.Process().cpu_affinity())
if cap is None:
return cpu_count
else: