From f1445721a98e6204a0e441a08d582cfe9e1843df Mon Sep 17 00:00:00 2001 From: Shannon Zhao Date: Wed, 18 Jun 2014 12:18:15 +0800 Subject: [PATCH 1/1] tools: fix alignment of cpu layout output Bug: when "core id" is greater than 9, the cpu_layout.py output doesn't align. Socket 0 Socket 1 --------- --------- Core 9 [4, 16] [10, 22] Core 10 [5, 17] [11, 23] Solution: adjust output format to align based on the maximum length of the "core id" and "processor" Socket 0 Socket 1 -------- -------- Core 9 [4, 16] [10, 22] Core 10 [5, 17] [11, 23] Signed-off-by: Shannon Zhao Acked-by: Pablo de Lara --- tools/cpu_layout.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/cpu_layout.py b/tools/cpu_layout.py index 623fad93ab..20a409d9d6 100755 --- a/tools/cpu_layout.py +++ b/tools/cpu_layout.py @@ -75,15 +75,21 @@ print "cores = ",cores 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_core_id_len = len(str(max(cores))) + +print " ".ljust(max_core_id_len + len('Core ')), for s in sockets: - print "\tSocket %s" % s, + print "Socket %s" % str(s).ljust(max_core_map_len - len('Socket ')), print "" +print " ".ljust(max_core_id_len + len('Core ')), for s in sockets: - print "\t---------", + print "--------".ljust(max_core_map_len), print "" for c in cores: - print "Core %s" % c, - for s in sockets: - print "\t", core_map[(s,c)], - print "\n" + print "Core %s" % str(c).ljust(max_core_id_len), + for s in sockets: + print str(core_map[(s,c)]).ljust(max_core_map_len), + print "\n" -- 2.20.1