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

Commit 54e2289a authored by Daniel Wagner's avatar Daniel Wagner Committed by Linus Torvalds
Browse files

scripts/gdb: use a generator instead of iterator for task list 



The iterator does not return any task_struct from the thread_group list
because the first condition in the 'if not t or ...' will only be the
first time None.

Instead of keeping track of the state ourself in the next() function, we
fall back using Python's generator.

Signed-off-by: default avatarDaniel Wagner <daniel.wagner@bmw-carit.de>
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 2478a8a1

scripts/gdb/linux/tasks.py

+20 −30
Original line number Original line Diff line number Diff line
@@ -18,38 +18,28 @@ from linux import utils 




task_type = utils.CachedType("struct task_struct")

task_type = utils.CachedType("struct task_struct")







def task_lists():

class TaskList:

    def __init__(self):

    global task_type

    global task_type

        self.task_ptr_type = task_type.get_type().pointer()

    task_ptr_type = task_type.get_type().pointer()

        self.init_task = gdb.parse_and_eval("init_task")

    init_task = gdb.parse_and_eval("init_task").address

        self.curr_group = self.init_task.address

    t = g = init_task

        self.curr_task = None





    while True:

    def __iter__(self):

        while True:

        return self

            yield t





    def __next__(self):

            t = utils.container_of(t['thread_group']['next'],

        t = self.curr_task

                                   task_ptr_type, "thread_group")

        if not t or t == self.curr_group:

            if t == g:

            self.curr_group = \

                break

                utils.container_of(self.curr_group['tasks']['next'],

                                   self.task_ptr_type, "tasks")

            if self.curr_group == self.init_task.address:

                raise StopIteration

            t = self.curr_task = self.curr_group

        else:

            self.curr_task = \

                utils.container_of(t['thread_group']['next'],

                                   self.task_ptr_type, "thread_group")

        return t





    def next(self):

        t = g = utils.container_of(g['tasks']['next'],

        return self.__next__()

                                   task_ptr_type, "tasks")

        if t == init_task:

            return





def get_task_by_pid(pid):

def get_task_by_pid(pid):

    for task in TaskList():

    for task in task_lists():

        if int(task['pid']) == pid:

        if int(task['pid']) == pid:

            return task

            return task

    return None

    return None