Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fffb944c authored by Jan Kiszka's avatar Jan Kiszka Committed by Linus Torvalds
Browse files

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: default avatarJan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54e2289a

scripts/gdb/linux/modules.py

+11 −22
Original line number Diff line number Diff line
@@ -19,31 +19,20 @@ from linux import cpus, utils 
module_type = utils.CachedType("struct module")





class ModuleList:

    def __init__(self):

def module_list():

    global module_type

        self.module_ptr_type = module_type.get_type().pointer()

    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

    entry = modules['next']

    end_of_list = modules.address



    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 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"):

scripts/gdb/linux/symbols.py

+1 −1
Original line number Diff line number Diff line
@@ -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: