mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
perf test: Cleanup daemon if test is interrupted.
Reorder daemon_start and daemon_exit as the trap handler is added in daemon_start referencing daemon_exit. Signed-off-by: Ian Rogers <irogers@google.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lore.kernel.org/lkml/20210317005505.2794804-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
87cb88d3c0
commit
078cbb6f75
1 changed files with 21 additions and 15 deletions
|
@ -98,21 +98,6 @@ check_line_other()
|
|||
fi
|
||||
}
|
||||
|
||||
daemon_start()
|
||||
{
|
||||
local config=$1
|
||||
local session=$2
|
||||
|
||||
perf daemon start --config ${config}
|
||||
|
||||
# wait for the session to ping
|
||||
local state="FAIL"
|
||||
while [ "${state}" != "OK" ]; do
|
||||
state=`perf daemon ping --config ${config} --session ${session} | awk '{ print $1 }'`
|
||||
sleep 0.05
|
||||
done
|
||||
}
|
||||
|
||||
daemon_exit()
|
||||
{
|
||||
local config=$1
|
||||
|
@ -120,6 +105,9 @@ daemon_exit()
|
|||
local line=`perf daemon --config ${config} -x: | head -1`
|
||||
local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'`
|
||||
|
||||
# Reset trap handler.
|
||||
trap - SIGINT SIGTERM
|
||||
|
||||
# stop daemon
|
||||
perf daemon stop --config ${config}
|
||||
|
||||
|
@ -127,6 +115,24 @@ daemon_exit()
|
|||
tail --pid=${pid} -f /dev/null
|
||||
}
|
||||
|
||||
daemon_start()
|
||||
{
|
||||
local config=$1
|
||||
local session=$2
|
||||
|
||||
perf daemon start --config ${config}
|
||||
|
||||
# Clean up daemon if interrupted.
|
||||
trap "echo 'FAILED: Signal caught'; daemon_exit ${config}; exit 1" SIGINT SIGTERM
|
||||
|
||||
# wait for the session to ping
|
||||
local state="FAIL"
|
||||
while [ "${state}" != "OK" ]; do
|
||||
state=`perf daemon ping --config ${config} --session ${session} | awk '{ print $1 }'`
|
||||
sleep 0.05
|
||||
done
|
||||
}
|
||||
|
||||
test_list()
|
||||
{
|
||||
echo "test daemon list"
|
||||
|
|
Loading…
Reference in a new issue