Skip to content

Commit 96d4b8e

Browse files
committed
PM: sleep: Refine error message in try_to_freeze_tasks()
A previous change amended try_to_freeze_tasks() with the "what" variable pointing to a string describing the group of tasks subject to the freezing which may be used in the error message in there too, so make that happen. Accordingly, update sleepgraph.py to catch the modified error message as appropriate. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Petr Mladek <pmladek@suse.com>
1 parent a449dfb commit 96d4b8e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

kernel/power/process.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ static int try_to_freeze_tasks(bool user_only)
8686
elapsed_msecs = ktime_to_ms(elapsed);
8787

8888
if (todo) {
89-
pr_err("Freezing of tasks %s after %d.%03d seconds "
90-
"(%d tasks refusing to freeze, wq_busy=%d):\n",
89+
pr_err("Freezing %s %s after %d.%03d seconds "
90+
"(%d tasks refusing to freeze, wq_busy=%d):\n", what,
9191
wakeup ? "aborted" : "failed",
9292
elapsed_msecs / 1000, elapsed_msecs % 1000,
9393
todo - wq_busy, wq_busy);

tools/power/pm-graph/sleepgraph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,7 @@ class Data:
14621462
'TIMEOUT' : r'(?i).*\bTIMEOUT\b.*',
14631463
'ABORT' : r'(?i).*\bABORT\b.*',
14641464
'IRQ' : r'.*\bgenirq: .*',
1465-
'TASKFAIL': r'.*Freezing of tasks *.*',
1465+
'TASKFAIL': r'.*Freezing .*after *.*',
14661466
'ACPI' : r'.*\bACPI *(?P<b>[A-Za-z]*) *Error[: ].*',
14671467
'DISKFULL': r'.*\bNo space left on device.*',
14681468
'USBERR' : r'.*usb .*device .*, error [0-9-]*',

0 commit comments

Comments
 (0)