On Fri, 9 Oct 2020 10:17:11 -0500 Tom Zanussi <zanu...@kernel.org> wrote:
> This test uses waking+wakeup_latency as an event name, which doesn't > make sense since it includes an operator. Illegal names are now > detected by the synthetic event command parsing, which causes this > test to fail. Change the name to 'waking_plus_wakeup_latency' to > prevent this. Good catch! Acked-by: Masami Hiramatsu <mhira...@kernel.org> Thanks! > > Fixes: f06eec4d0f2c (selftests: ftrace: Add inter-event hist triggers > testcases) > Signed-off-by: Tom Zanussi <zanu...@kernel.org> > --- > .../inter-event/trigger-inter-event-combined-hist.tc | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git > a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc > > b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc > index 7449a4b8f1f9..9098f1e7433f 100644 > --- > a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc > +++ > b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc > @@ -25,12 +25,12 @@ echo 'wakeup_latency u64 lat pid_t pid' >> > synthetic_events > echo 'hist:keys=pid:ts1=common_timestamp.usecs if comm=="ping"' >> > events/sched/sched_wakeup/trigger > echo > 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts1:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid) > if next_comm=="ping"' > events/sched/sched_switch/trigger > > -echo 'waking+wakeup_latency u64 lat; pid_t pid' >> synthetic_events > -echo > 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking+wakeup_latency($ww_lat,pid)' > >> events/synthetic/wakeup_latency/trigger > -echo 'hist:keys=pid,lat:sort=pid,lat' >> > events/synthetic/waking+wakeup_latency/trigger > +echo 'waking_plus_wakeup_latency u64 lat; pid_t pid' >> synthetic_events > +echo > 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking_plus_wakeup_latency($ww_lat,pid)' > >> events/synthetic/wakeup_latency/trigger > +echo 'hist:keys=pid,lat:sort=pid,lat' >> > events/synthetic/waking_plus_wakeup_latency/trigger > > ping $LOCALHOST -c 3 > -if ! grep -q "pid:" events/synthetic/waking+wakeup_latency/hist; then > +if ! grep -q "pid:" events/synthetic/waking_plus_wakeup_latency/hist; then > fail "Failed to create combined histogram" > fi > > -- > 2.17.1 > -- Masami Hiramatsu <mhira...@kernel.org>
