X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=usertools%2Fcpu_layout.py;h=891b9238fa193b8c4afbc1f452d6eaa5383affdf;hb=dd56077573fb3aea8f4aaee1de796cd1d244b74f;hp=6f129b1db8db7d222bbf804af9ef1ac7de3ef820;hpb=9c75ffc4e6a4a992712ecc92b6451291366ea519;p=dpdk.git

diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
index 6f129b1db8..891b9238fa 100755
--- a/usertools/cpu_layout.py
+++ b/usertools/cpu_layout.py
@@ -1,15 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2010-2014 Intel Corporation
 # Copyright(c) 2017 Cavium, Inc. All rights reserved.
 
-from __future__ import print_function
-import sys
-try:
-    xrange # Python 2
-except NameError:
-    xrange = range # Python 3
-
 sockets = []
 cores = []
 core_map = {}
@@ -17,13 +10,11 @@ base_path = "/sys/devices/system/cpu"
 fd = open("{}/kernel_max".format(base_path))
 max_cpus = int(fd.read())
 fd.close()
-for cpu in xrange(max_cpus + 1):
+for cpu in range(max_cpus + 1):
     try:
         fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
     except IOError:
         continue
-    except:
-        break
     core = int(fd.read())
     fd.close()
     fd = open("{}/cpu{}/topology/physical_package_id".format(base_path, cpu))
@@ -66,7 +57,7 @@ print(output)
 for c in cores:
     output = "Core %s" % str(c).ljust(max_core_id_len)
     for s in sockets:
-        if (s,c) in core_map:
+        if (s, c) in core_map:
             output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
         else:
             output += " " * (max_core_map_len + 1)