From 071f330d1f648beefda325fb5e0fb5d68b161a04 Mon Sep 17 00:00:00 2001 From: Serapheim Dimitropoulos Date: Tue, 26 May 2020 17:09:16 +0000 Subject: [PATCH 1/2] Update `stacks` test cases drgn fixed the bug where runnable threads are distinguished from running threads and thus uit correctly goes to look for them in memory instead of the PRSTATUS notes. drgn commit: github.com/osandov/drgn/commit/eea5422546004d29f85e4d0b94d62fd7564db15a --- tests/integration/data/regression_output/linux/stacks | 6 ++++++ tests/integration/data/regression_output/linux/stacks -a | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tests/integration/data/regression_output/linux/stacks b/tests/integration/data/regression_output/linux/stacks index 889f66d8..3b6f9a41 100644 --- a/tests/integration/data/regression_output/linux/stacks +++ b/tests/integration/data/regression_output/linux/stacks @@ -241,6 +241,12 @@ TASK_STRUCT STATE COUNT ret_from_fork+0x1f 0xffffa08966a01700 RUNNING 1 + __schedule+0x2c0 + schedule+0x2c + schedule_timeout+0x169 + rcu_gp_kthread+0x572 + kthread+0x121 + ret_from_fork+0x1f 0xffffa08966a6dc00 INTERRUPTIBLE 1 __schedule+0x2c0 diff --git a/tests/integration/data/regression_output/linux/stacks -a b/tests/integration/data/regression_output/linux/stacks -a index 5ee8e4df..e4d19c08 100644 --- a/tests/integration/data/regression_output/linux/stacks -a +++ b/tests/integration/data/regression_output/linux/stacks -a @@ -765,6 +765,12 @@ TASK_STRUCT STATE ret_from_fork+0x1f 0xffffa08966a01700 RUNNING + __schedule+0x2c0 + schedule+0x2c + schedule_timeout+0x169 + rcu_gp_kthread+0x572 + kthread+0x121 + ret_from_fork+0x1f 0xffffa08966a6dc00 INTERRUPTIBLE __schedule+0x2c0 From bc14ae14cc55d354a54ad6f228a2e9a9fbb0309b Mon Sep 17 00:00:00 2001 From: Serapheim Dimitropoulos Date: Tue, 26 May 2020 17:19:09 +0000 Subject: [PATCH 2/2] delete dead code from internal/__init__.py files --- sdb/commands/internal/__init__.py | 4 ---- sdb/commands/linux/internal/__init__.py | 4 ---- sdb/commands/spl/internal/__init__.py | 4 ---- 3 files changed, 12 deletions(-) diff --git a/sdb/commands/internal/__init__.py b/sdb/commands/internal/__init__.py index 66455000..9bafcd66 100644 --- a/sdb/commands/internal/__init__.py +++ b/sdb/commands/internal/__init__.py @@ -24,7 +24,3 @@ if path != __file__: module = os.path.splitext(os.path.basename(path))[0] importlib.import_module("sdb.commands.internal.{}".format(module)) - -for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))): - module = os.path.basename(os.path.dirname(path)) - importlib.import_module("sdb.commands.internal.{}".format(module)) diff --git a/sdb/commands/linux/internal/__init__.py b/sdb/commands/linux/internal/__init__.py index acbf7e06..f3764e35 100644 --- a/sdb/commands/linux/internal/__init__.py +++ b/sdb/commands/linux/internal/__init__.py @@ -24,7 +24,3 @@ if path != __file__: module = os.path.splitext(os.path.basename(path))[0] importlib.import_module("sdb.commands.linux.internal.{}".format(module)) - -for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))): - module = os.path.basename(os.path.dirname(path)) - importlib.import_module("sdb.commands.linux.internal.{}".format(module)) diff --git a/sdb/commands/spl/internal/__init__.py b/sdb/commands/spl/internal/__init__.py index 65856e8f..8733bb3f 100644 --- a/sdb/commands/spl/internal/__init__.py +++ b/sdb/commands/spl/internal/__init__.py @@ -24,7 +24,3 @@ if path != __file__: module = os.path.splitext(os.path.basename(path))[0] importlib.import_module("sdb.commands.spl.internal.{}".format(module)) - -for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))): - module = os.path.basename(os.path.dirname(path)) - importlib.import_module("sdb.commands.spl.internal.{}".format(module))