summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Kacur <jkacur@redhat.com>2016-05-30 13:27:03 +0200
committerJiri Kastner <jkastner@redhat.com>2016-05-31 21:36:23 +0200
commit8d4b784feda43cbe67b721c425439e973cd58173 (patch)
tree3d8dfff4f2dcdfdb05a5f285f1db231b720be166
parentafdfe1b90f9bc9c94b6fccd9a8143c787a62ba11 (diff)
downloadtuna-8d4b784feda43cbe67b721c425439e973cd58173.tar.gz
tuna: cpuview.py: Omit offline cpus in socket_ids list
sysfy.py inserts None for offline cpus in class cpus, method reload, via class cpu method reload. This is potentially useful, so we don't want to change these classes. However in cpuview.py - class cpuview, we don't want to display these offline cpus, so we only need to recognize that the type None can be returned and then skip over it. This fixes Bugzilla 1036156 First detected on some ppc ./tuna-cmd.py Traceback (most recent call last): File "./tuna-cmd.py", line 656, in <module> main() File "./tuna-cmd.py", line 650, in main app = tuna_gui.main_gui(kthreads, uthreads, cpus_filtered) File "/home/jkacur/tuna/tuna/tuna_gui.py", line 49, in __init__ self.procview, self.irqview, cpus_filtered) File "/home/jkacur/tuna/tuna/gui/cpuview.py", line 253, in __init__ socket_ids = [ int(id) for id in self.cpus.sockets.keys() ] Signed-off-by: John Kacur <jkacur@redhat.com> Signed-off-by: Jiri Kastner <jkastner@redhat.com>
-rwxr-xr-xtuna/gui/cpuview.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tuna/gui/cpuview.py b/tuna/gui/cpuview.py
index 41a3d9b..c84ecd7 100755
--- a/tuna/gui/cpuview.py
+++ b/tuna/gui/cpuview.py
@@ -250,7 +250,12 @@ class cpuview:
self.irqview = irqview
vbox = window.get_child().get_child()
- socket_ids = [ int(id) for id in self.cpus.sockets.keys() ]
+ socket_ids = []
+ for id in self.cpus.sockets.keys():
+ try:
+ socket_ids.append(int(id))
+ except TypeError: # Skip over offline cpus - type None
+ continue
socket_ids.sort()
self.nr_sockets = len(socket_ids)