summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorPeng Zhang <[email protected]>2022-09-22 10:06:42 +0200
committerThomas Monjalon <[email protected]>2022-10-11 02:13:52 +0200
commit9d4efc5cc6f90bcbd93a6fed904c8cbca9f5c447 (patch)
treee55a0fd46f2dd0c1873e13f2488f1cc48086c1bb /buildtools
parent0ce3cf4afd04c8d202fb9ae33181d4962112bd97 (diff)
buildtools: fix NUMA nodes count
The method to fetch, sort and read the last entry of a list to figure out the total number of NUMA nodes in the system fails with 10 or more nodes. The reason being the usage of string compare while sorting, hence node 'node10' will be sorted before 'node2'. Solve this by sorting the list based on integer comparison of the numerical part of the node name. Before this change on a system with 16 NUMA nodes, EAL: Detected CPU lcores: 128 EAL: Detected NUMA nodes: 10 EAL: Static memory layout is selected, amount of reserved memory can be adjusted with -m or --socket-mem EAL: Detected static linkage of DPDK EAL: Multi-process socket /var/run/dpdk/rte/mp_socket EAL: Selected IOVA mode 'VA' EAL: VFIO support initialized With this change on the same system, EAL: Detected CPU lcores: 128 EAL: Detected NUMA nodes: 16 EAL: Static memory layout is selected, amount of reserved memory can be adjusted with -m or --socket-mem EAL: Detected static linkage of DPDK EAL: Multi-process socket /var/run/dpdk/rte/mp_socket EAL: Selected IOVA mode 'VA' EAL: VFIO support initialized Fixes: 8ef09fdc506b ("build: add optional NUMA and CPU counts detection") Cc: [email protected] Signed-off-by: Peng Zhang <[email protected]> Signed-off-by: Chaoyong He <[email protected]> Reviewed-by: Niklas Söderlund <[email protected]>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/get-numa-count.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/get-numa-count.py b/buildtools/get-numa-count.py
index 1b7787787f..2f243886cd 100644
--- a/buildtools/get-numa-count.py
+++ b/buildtools/get-numa-count.py
@@ -6,11 +6,12 @@ import ctypes
import glob
import os
import subprocess
+import re
if os.name == 'posix':
if os.path.isdir('/sys/devices/system/node'):
numa_nodes = glob.glob('/sys/devices/system/node/node*')
- numa_nodes.sort()
+ numa_nodes.sort(key=lambda l: int(re.findall('\d+', l)[0]))
print(int(os.path.basename(numa_nodes[-1])[4:]) + 1)
else:
subprocess.run(['sysctl', '-n', 'vm.ndomains'], check=False)