[dpdk-dev] [PATCH v3] cpu_layout.py: adjust output format to align

[dpdk-dev] [PATCH v3] cpu_layout.py: adjust output format to align

[Shannon Zhao]

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 <zhaoshenglong@huawei.com>
---
 tools/cpu_layout.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/cpu_layout.py b/tools/cpu_layout.py
index 9eff9d7..52d01a8 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,
+	print "Core %s" % str(c).ljust(max_core_id_len),
 	for s in sockets:
-		print "\t", core_map[(s,c)],
+		print str(core_map[(s,c)]).ljust(max_core_map_len),
 	print "\n"
-- 
1.9.0.msysgit.0

Re: [dpdk-dev] [PATCH v2] cpu_layout.py: adjust output format to align

[Thomas Monjalon]

Hi Shannon,

I feel this version is better but it's really complicated to read.

> +max_processor_len=len(str(len(cores)*len(sockets)*2-1))
> +max_core_map_len = max_processor_len*2+4
> +if max_core_map_len < 12:
> +        max_core_map_len = 12

This line is not indented as the other ones.

> +max_core_id_len=len(str(max(cores)))
> +
> +print " ".ljust(max_core_id_len+5),
>  for s in sockets:
> -	print "\tSocket %s" % s,
> +	print "Socket %s" % str(s).ljust(max_core_map_len-7),
>  print ""
> +print " ".ljust(max_core_id_len+5),

Could you replace all these numbers by something meaningful and easier to 
understand?
Example: 5 can be replaced by len('Core ')

Other comment: please add spaces around operators (= + - *).

Thanks
-- 
Thomas

[dpdk-dev] [PATCH v3] cpu_layout.py: adjust output format to align

[Shannon Zhao]

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 <zhaoshenglong@huawei.com>
---
 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 623fad9..20a409d 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"
-- 
1.9.0.msysgit.0

Re: [dpdk-dev] [PATCH v3] cpu_layout.py: adjust output format to align

[De Lara Guarch, Pablo]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Shannon Zhao
> Sent: Wednesday, June 18, 2014 5:18 AM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v3] cpu_layout.py: adjust output format to align
> 
> 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 <zhaoshenglong@huawei.com>

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Re: [dpdk-dev] [PATCH v3] cpu_layout.py: adjust output format to align

[Thomas Monjalon]

> > 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 <zhaoshenglong@huawei.com>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied for version 1.7.0.

Thanks
-- 
Thomas