git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus/pci: use SPDX tags in 6WIND copyrighted files
[dpdk.git]
/
usertools
/
cpu_layout.py
diff --git
a/usertools/cpu_layout.py
b/usertools/cpu_layout.py
index
5735891
..
d3c8eba
100755
(executable)
--- a/
usertools/cpu_layout.py
+++ b/
usertools/cpu_layout.py
@@
-4,7
+4,7
@@
# BSD LICENSE
#
# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
# BSD LICENSE
#
# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
-# Copyright(c) 2017 Cavium
Networks Ltd
. All rights reserved.
+# Copyright(c) 2017 Cavium
, Inc
. All rights reserved.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@
-35,6
+35,10
@@
#
from __future__ import print_function
import sys
#
from __future__ import print_function
import sys
+try:
+ xrange # Python 2
+except NameError:
+ xrange = range # Python 3
sockets = []
cores = []
sockets = []
cores = []
@@
-46,6
+50,8
@@
fd.close()
for cpu in xrange(max_cpus + 1):
try:
fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
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())
except:
break
core = int(fd.read())
@@
-70,7
+76,10
@@
print("sockets = ", sockets)
print("")
max_processor_len = len(str(len(cores) * len(sockets) * 2 - 1))
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(list(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 '))
max_core_id_len = len(str(max(cores)))
output = " ".ljust(max_core_id_len + len('Core '))
@@
-87,5
+96,8
@@
print(output)
for c in cores:
output = "Core %s" % str(c).ljust(max_core_id_len)
for s in sockets:
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 (s,c) in core_map:
+ output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
+ else:
+ output += " " * (max_core_map_len + 1)
print(output)
print(output)