From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Ian Rogers <irogers@google.com>,
Stephane Eranian <eranian@google.com>,
Alexei Budankov <abudankov@huawei.com>
Subject: [PATCH 20/24] perf tests: Add daemon reconfig test
Date: Sun, 31 Jan 2021 00:48:52 +0100 [thread overview]
Message-ID: <20210130234856.271282-21-jolsa@kernel.org> (raw)
In-Reply-To: <20210130234856.271282-1-jolsa@kernel.org>
Adding test for daemon reconfiguration. The test changes
the configuration file and checks that the session is
changed properly.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/tests/shell/daemon.sh | 119 +++++++++++++++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/tools/perf/tests/shell/daemon.sh b/tools/perf/tests/shell/daemon.sh
index 874e1fd77c7e..90a6e8caddfb 100755
--- a/tools/perf/tests/shell/daemon.sh
+++ b/tools/perf/tests/shell/daemon.sh
@@ -177,8 +177,127 @@ EOF
rm -f ${config}
}
+test_reconfig()
+{
+ echo "test daemon reconfig"
+
+ local config=$(mktemp /tmp/perf.daemon.config.XXX)
+ local base=$(mktemp -d /tmp/perf.daemon.base.XXX)
+
+ # prepare config
+ cat <<EOF > ${config}
+[daemon]
+base=BASE
+
+[session-size]
+run = -e cpu-clock
+
+[session-time]
+run = -e task-clock
+EOF
+
+ sed -i -e "s|BASE|${base}|" ${config}
+
+ # start daemon
+ daemon_start ${config} size
+
+ # check 2nd session
+ # pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0
+ local line=`perf daemon --config ${config} -x: | head -3 | tail -1`
+ check_line_other "${line}" time "-e task-clock" ${base}/session-time \
+ ${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0"
+ local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'`
+
+ # prepare new config
+ local config_new=${config}.new
+ cat <<EOF > ${config_new}
+[daemon]
+base=BASE
+
+[session-size]
+run = -e cpu-clock
+
+[session-time]
+run = -e cpu-clock
+EOF
+
+ # TEST 1 - change config
+
+ sed -i -e "s|BASE|${base}|" ${config_new}
+ cp ${config_new} ${config}
+
+ # wait for old session to finish
+ tail --pid=${pid} -f /dev/null
+
+ # wait for new one to start
+ local state="FAIL"
+ while [ "${state}" != "OK" ]; do
+ state=`perf daemon ping --config ${config} --session time | awk '{ print $1 }'`
+ done
+
+ # check reconfigured 2nd session
+ # pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0
+ local line=`perf daemon --config ${config} -x: | head -3 | tail -1`
+ check_line_other "${line}" time "-e cpu-clock" ${base}/session-time \
+ ${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0"
+
+ # TEST 2 - empty config
+
+ local config_empty=${config}.empty
+ cat <<EOF > ${config_empty}
+[daemon]
+base=BASE
+EOF
+
+ # change config
+ sed -i -e "s|BASE|${base}|" ${config_empty}
+ cp ${config_empty} ${config}
+
+ # wait for sessions to finish
+ local state="OK"
+ while [ "${state}" != "FAIL" ]; do
+ state=`perf daemon ping --config ${config} --session time | awk '{ print $1 }'`
+ done
+
+ local state="OK"
+ while [ "${state}" != "FAIL" ]; do
+ state=`perf daemon ping --config ${config} --session size | awk '{ print $1 }'`
+ done
+
+ local one=`perf daemon --config ${config} -x: | wc -l`
+
+ if [ ${one} -ne "1" ]; then
+ echo "FAILED: wrong list output"
+ error=1
+ fi
+
+ # TEST 3 - config again
+
+ cp ${config_new} ${config}
+
+ # wait for size to start
+ local state="FAIL"
+ while [ "${state}" != "OK" ]; do
+ state=`perf daemon ping --config ${config} --session size | awk '{ print $1 }'`
+ done
+
+ # wait for time to start
+ local state="FAIL"
+ while [ "${state}" != "OK" ]; do
+ state=`perf daemon ping --config ${config} --session time | awk '{ print $1 }'`
+ done
+
+ # stop daemon
+ daemon_exit ${base} ${config}
+
+ rm -rf ${base}
+ rm -f ${config}
+ rm -f ${config_new}
+ rm -f ${config_empty}
+}
error=0
test_list
+test_reconfig
exit ${error}
--
2.29.2
next prev parent reply other threads:[~2021-01-30 23:56 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210129134855.195810-1-jolsa@redhat.com>
2021-01-30 23:48 ` [PATCHv3 00/24] perf tools: Add daemon command Jiri Olsa
2021-01-30 23:48 ` [PATCH 01/24] perf daemon: " Jiri Olsa
2021-01-30 23:48 ` [PATCH 02/24] perf daemon: Add config option Jiri Olsa
2021-02-03 20:57 ` Arnaldo Carvalho de Melo
2021-02-04 14:42 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 03/24] perf daemon: Add base option Jiri Olsa
2021-02-03 20:57 ` Arnaldo Carvalho de Melo
2021-01-30 23:48 ` [PATCH 04/24] perf daemon: Add server socket support Jiri Olsa
2021-02-03 21:04 ` Arnaldo Carvalho de Melo
2021-02-04 14:49 ` Jiri Olsa
2021-02-04 15:53 ` Arnaldo Carvalho de Melo
2021-02-05 11:30 ` Namhyung Kim
2021-02-06 19:04 ` Jiri Olsa
2021-02-07 1:36 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 05/24] perf daemon: Add client " Jiri Olsa
2021-02-03 21:05 ` Arnaldo Carvalho de Melo
2021-02-04 14:50 ` Jiri Olsa
2021-02-05 11:39 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 06/24] perf daemon: Add config file support Jiri Olsa
2021-02-03 21:12 ` Arnaldo Carvalho de Melo
2021-02-04 15:08 ` Jiri Olsa
2021-02-06 20:25 ` Jiri Olsa
2021-02-04 12:42 ` Namhyung Kim
2021-02-04 12:58 ` Arnaldo Carvalho de Melo
2021-02-04 15:10 ` Jiri Olsa
2021-02-06 8:06 ` Namhyung Kim
2021-02-05 12:14 ` Namhyung Kim
2021-02-05 12:56 ` Jiri Olsa
2021-02-06 8:05 ` Namhyung Kim
2021-02-06 22:35 ` Jiri Olsa
2021-02-07 1:38 ` Namhyung Kim
2021-01-30 23:48 ` [PATCH 07/24] perf daemon: Add config file change check Jiri Olsa
2021-02-03 21:13 ` Arnaldo Carvalho de Melo
2021-02-04 14:51 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 08/24] perf daemon: Add background support Jiri Olsa
2021-02-03 21:16 ` Arnaldo Carvalho de Melo
2021-02-04 14:52 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 09/24] perf daemon: Add signalfd support Jiri Olsa
2021-02-03 21:24 ` Arnaldo Carvalho de Melo
2021-02-04 15:06 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 10/24] perf daemon: Add list command Jiri Olsa
2021-01-30 23:48 ` [PATCH 11/24] perf daemon: Add signal command Jiri Olsa
2021-01-30 23:48 ` [PATCH 12/24] perf daemon: Add stop command Jiri Olsa
2021-01-30 23:48 ` [PATCH 13/24] perf daemon: Allow only one daemon over base directory Jiri Olsa
2021-01-30 23:48 ` [PATCH 14/24] perf daemon: Set control fifo for session Jiri Olsa
2021-01-30 23:48 ` [PATCH 15/24] perf daemon: Add ping command Jiri Olsa
2021-01-30 23:48 ` [PATCH 16/24] perf daemon: Use control to stop session Jiri Olsa
2021-01-30 23:48 ` [PATCH 17/24] perf daemon: Add up time for daemon/session list Jiri Olsa
2021-01-30 23:48 ` [PATCH 18/24] perf daemon: Add man page for perf-daemon Jiri Olsa
2021-02-03 21:17 ` Arnaldo Carvalho de Melo
2021-02-04 14:53 ` Jiri Olsa
2021-01-30 23:48 ` [PATCH 19/24] perf tests: Add daemon list command test Jiri Olsa
2021-01-30 23:48 ` Jiri Olsa [this message]
2021-01-30 23:48 ` [PATCH 21/24] perf tests: Add daemon stop " Jiri Olsa
2021-01-30 23:48 ` [PATCH 22/24] perf tests: Add daemon signal " Jiri Olsa
2021-01-30 23:48 ` [PATCH 23/24] perf tests: Add daemon ping " Jiri Olsa
2021-01-30 23:48 ` [PATCH 24/24] perf tests: Add daemon lock test Jiri Olsa
2021-02-08 20:08 [PATCHv4 00/24] perf tools: Add daemon command Jiri Olsa
2021-02-08 20:09 ` [PATCH 20/24] perf tests: Add daemon reconfig test Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210130234856.271282-21-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=abudankov@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).