tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
scripts/gdb: convert CpuList to generator function
Yet another code simplification.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Jan Kiszka
and committed by
Linus Torvalds
a77e15e8
fffb944c
+32
-39
+31
-38
scripts/gdb/linux/cpus.py
+31
-38
scripts/gdb/linux/cpus.py
···
61
61
gdb.events.new_objfile.disconnect(cpu_mask_invalidate)
62
62
63
63
64
-
class CpuList():
65
-
def __init__(self, mask_name):
66
-
global cpu_mask
67
-
self.mask = None
68
-
if mask_name in cpu_mask:
69
-
self.mask = cpu_mask[mask_name]
70
-
if self.mask is None:
71
-
self.mask = gdb.parse_and_eval(mask_name + ".bits")
72
-
if hasattr(gdb, 'events'):
73
-
cpu_mask[mask_name] = self.mask
74
-
gdb.events.stop.connect(cpu_mask_invalidate)
75
-
if hasattr(gdb.events, 'new_objfile'):
76
-
gdb.events.new_objfile.connect(cpu_mask_invalidate)
77
-
self.bits_per_entry = self.mask[0].type.sizeof * 8
78
-
self.num_entries = self.mask.type.sizeof * 8 / self.bits_per_entry
79
-
self.entry = -1
80
-
self.bits = 0
64
+
def cpu_list(mask_name):
65
+
global cpu_mask
66
+
mask = None
67
+
if mask_name in cpu_mask:
68
+
mask = cpu_mask[mask_name]
69
+
if mask is None:
70
+
mask = gdb.parse_and_eval(mask_name + ".bits")
71
+
if hasattr(gdb, 'events'):
72
+
cpu_mask[mask_name] = mask
73
+
gdb.events.stop.connect(cpu_mask_invalidate)
74
+
if hasattr(gdb.events, 'new_objfile'):
75
+
gdb.events.new_objfile.connect(cpu_mask_invalidate)
76
+
bits_per_entry = mask[0].type.sizeof * 8
77
+
num_entries = mask.type.sizeof * 8 / bits_per_entry
78
+
entry = -1
79
+
bits = 0
81
80
82
-
def __iter__(self):
83
-
return self
84
-
85
-
def __next__(self):
86
-
while self.bits == 0:
87
-
self.entry += 1
88
-
if self.entry == self.num_entries:
89
-
raise StopIteration
90
-
self.bits = self.mask[self.entry]
91
-
if self.bits != 0:
92
-
self.bit = 0
81
+
while True:
82
+
while bits == 0:
83
+
entry += 1
84
+
if entry == num_entries:
85
+
return
86
+
bits = mask[entry]
87
+
if bits != 0:
88
+
bit = 0
93
89
break
94
90
95
-
while self.bits & 1 == 0:
96
-
self.bits >>= 1
97
-
self.bit += 1
91
+
while bits & 1 == 0:
92
+
bits >>= 1
93
+
bit += 1
98
94
99
-
cpu = self.entry * self.bits_per_entry + self.bit
95
+
cpu = entry * bits_per_entry + bit
100
96
101
-
self.bits >>= 1
102
-
self.bit += 1
97
+
bits >>= 1
98
+
bit += 1
103
99
104
-
return cpu
105
-
106
-
def next(self):
107
-
return self.__next__()
100
+
yield cpu
108
101
109
102
110
103
class PerCpu(gdb.Function):
+1
-1
scripts/gdb/linux/modules.py
+1
-1
scripts/gdb/linux/modules.py