summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2015-02-17 13:47:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-17 14:34:55 -0800
commitfffb944c4e6d3882a7a15c494bd4cde36c68c39c (patch)
tree801f69e1d2721cb1e0b49f46b48d32e55beae2f3 /scripts
parent54e2289a34e13d956acb841a00c3a6f06aced3f9 (diff)
downloadlinux-fffb944c4e6d3882a7a15c494bd4cde36c68c39c.tar.bz2
scripts/gdb: convert ModuleList to generator function
Analogously to the task list, convert the module list to a generator function. It noticeably simplifies the code. 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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/gdb/linux/modules.py33
-rw-r--r--scripts/gdb/linux/symbols.py2
2 files changed, 12 insertions, 23 deletions
diff --git a/scripts/gdb/linux/modules.py b/scripts/gdb/linux/modules.py
index 2dbf6796ce4f..6d497229d026 100644
--- a/scripts/gdb/linux/modules.py
+++ b/scripts/gdb/linux/modules.py
@@ -19,31 +19,20 @@ from linux import cpus, utils
module_type = utils.CachedType("struct module")
-class ModuleList:
- def __init__(self):
- global module_type
- self.module_ptr_type = module_type.get_type().pointer()
- modules = gdb.parse_and_eval("modules")
- self.curr_entry = modules['next']
- self.end_of_list = modules.address
-
- def __iter__(self):
- return self
-
- def __next__(self):
- entry = self.curr_entry
- if entry != self.end_of_list:
- self.curr_entry = entry['next']
- return utils.container_of(entry, self.module_ptr_type, "list")
- else:
- raise StopIteration
+def module_list():
+ global module_type
+ module_ptr_type = module_type.get_type().pointer()
+ modules = gdb.parse_and_eval("modules")
+ entry = modules['next']
+ end_of_list = modules.address
- def next(self):
- return self.__next__()
+ while entry != end_of_list:
+ yield utils.container_of(entry, module_ptr_type, "list")
+ entry = entry['next']
def find_module_by_name(name):
- for module in ModuleList():
+ for module in module_list():
if module['name'].string() == name:
return module
return None
@@ -83,7 +72,7 @@ class LxLsmod(gdb.Command):
"Address{0} Module Size Used by\n".format(
" " if utils.get_long_type().sizeof == 8 else ""))
- for module in ModuleList():
+ for module in module_list():
ref = 0
module_refptr = module['refptr']
for cpu in cpus.CpuList("cpu_possible_mask"):
diff --git a/scripts/gdb/linux/symbols.py b/scripts/gdb/linux/symbols.py
index ae757fdf5ce6..bf05e451c586 100644
--- a/scripts/gdb/linux/symbols.py
+++ b/scripts/gdb/linux/symbols.py
@@ -133,7 +133,7 @@ lx-symbols command."""
gdb.execute("symbol-file vmlinux")
self.loaded_modules = []
- module_list = modules.ModuleList()
+ module_list = modules.module_list()
if not module_list:
gdb.write("no modules found\n")
else: