* [PATCH] PM: tools: Fix sleepgraph syntax error
@ 2023-11-15 16:47 David Woodhouse
2023-11-15 17:21 ` Wolfram Sang
0 siblings, 1 reply; 3+ messages in thread
From: David Woodhouse @ 2023-11-15 16:47 UTC (permalink / raw)
To: Len Brown, Todd E Brandt, Xueqin Luo, Rafael J. Wysocki
Cc: linux-pm, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]
From: David Woodhouse <dwmw@amazon.co.uk>
The sleepgraph tool currently fails:
File "/usr/bin/sleepgraph", line 4155
or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)):
^
SyntaxError: unmatched ')'
Fixes: 34ea427e01ea ("PM: tools: sleepgraph: Recognize "CPU killed" messages")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py
index 4a356a706785..40ad221e8881 100755
--- a/tools/power/pm-graph/sleepgraph.py
+++ b/tools/power/pm-graph/sleepgraph.py
@@ -4151,7 +4151,7 @@ def parseKernelLog(data):
elif(re.match('Enabling non-boot CPUs .*', msg)):
# start of first cpu resume
cpu_start = ktime
- elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)) \
+ elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg) \
or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)):
# end of a cpu suspend, start of the next
m = re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] PM: tools: Fix sleepgraph syntax error
2023-11-15 16:47 [PATCH] PM: tools: Fix sleepgraph syntax error David Woodhouse
@ 2023-11-15 17:21 ` Wolfram Sang
2023-11-20 17:01 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Wolfram Sang @ 2023-11-15 17:21 UTC (permalink / raw)
To: David Woodhouse
Cc: Len Brown, Todd E Brandt, Xueqin Luo, Rafael J. Wysocki, linux-pm,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
On Wed, Nov 15, 2023 at 11:47:51AM -0500, David Woodhouse wrote:
> From: David Woodhouse <dwmw@amazon.co.uk>
>
> The sleepgraph tool currently fails:
>
> File "/usr/bin/sleepgraph", line 4155
> or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)):
> ^
> SyntaxError: unmatched ')'
>
> Fixes: 34ea427e01ea ("PM: tools: sleepgraph: Recognize "CPU killed" messages")
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Had the same issue:
Reviewed-by: Wolfram Sang <wsa@kernel.org>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] PM: tools: Fix sleepgraph syntax error
2023-11-15 17:21 ` Wolfram Sang
@ 2023-11-20 17:01 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2023-11-20 17:01 UTC (permalink / raw)
To: Wolfram Sang, David Woodhouse
Cc: linux-kernel, Len Brown, Xueqin Luo, Todd E Brandt,
Rafael J. Wysocki, linux-pm
On Wed, Nov 15, 2023 at 6:21 PM Wolfram Sang <wsa@kernel.org> wrote:
>
> On Wed, Nov 15, 2023 at 11:47:51AM -0500, David Woodhouse wrote:
> > From: David Woodhouse <dwmw@amazon.co.uk>
> >
> > The sleepgraph tool currently fails:
> >
> > File "/usr/bin/sleepgraph", line 4155
> > or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)):
> > ^
> > SyntaxError: unmatched ')'
> >
> > Fixes: 34ea427e01ea ("PM: tools: sleepgraph: Recognize "CPU killed" messages")
> > Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
>
> Had the same issue:
>
> Reviewed-by: Wolfram Sang <wsa@kernel.org>
Applied as 6.7-rc material, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-20 17:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 16:47 [PATCH] PM: tools: Fix sleepgraph syntax error David Woodhouse
2023-11-15 17:21 ` Wolfram Sang
2023-11-20 17:01 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox