summaryrefslogtreecommitdiff
path: root/usertools
diff options
context:
space:
mode:
authorGowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>2017-04-28 16:04:35 +0530
committerThomas Monjalon <thomas@monjalon.net>2017-04-30 15:28:01 +0200
commit63985c5f104edbfe2a3933706a67a2e5af04e97b (patch)
tree12e737c196d75ed8cab82f3d7d1c28fe8f57de6c /usertools
parentb153c00bf834185c2d584232fbd02cbc1a3653b2 (diff)
downloaddpdk-63985c5f104edbfe2a3933706a67a2e5af04e97b.zip
dpdk-63985c5f104edbfe2a3933706a67a2e5af04e97b.tar.gz
dpdk-63985c5f104edbfe2a3933706a67a2e5af04e97b.tar.xz
usertools: fix CPU layout for more than 2 threads
Current usertools/cpu_layout.py is broken to handle multithreads of count more than 2 as in IBM powerpc P8 servers. Below patch addressed this issue. Also, added minor exception catch on failing to open unavailable sys file in case of multithread=off configuration in server. Patch has been verified not to break existing topology configurations and also not changing anything in current output. Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> Reviewed-by: Andriy Berestovskyy <andriy.berestovskyy@caviumnetworks.com>
Diffstat (limited to 'usertools')
-rwxr-xr-xusertools/cpu_layout.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
index 5735891..99152a2 100755
--- a/usertools/cpu_layout.py
+++ b/usertools/cpu_layout.py
@@ -46,6 +46,8 @@ fd.close()
for cpu in xrange(max_cpus + 1):
try:
fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
+ except IOError:
+ continue
except:
break
core = int(fd.read())
@@ -70,7 +72,10 @@ print("sockets = ", sockets)
print("")
max_processor_len = len(str(len(cores) * len(sockets) * 2 - 1))
-max_core_map_len = max_processor_len * 2 + len('[, ]') + len('Socket ')
+max_thread_count = len(core_map.values()[0])
+max_core_map_len = (max_processor_len * max_thread_count) \
+ + len(", ") * (max_thread_count - 1) \
+ + len('[]') + len('Socket ')
max_core_id_len = len(str(max(cores)))
output = " ".ljust(max_core_id_len + len('Core '))
@@ -87,5 +92,8 @@ print(output)
for c in cores:
output = "Core %s" % str(c).ljust(max_core_id_len)
for s in sockets:
- output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
+ if core_map.has_key((s,c)):
+ output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
+ else:
+ output += " " * (max_core_map_len + 1)
print(output)