[PATCH v2 1/3] perf test: Remove unused argument

[PATCH v2 1/3] perf test: Remove unused argument

[Ian Rogers]

Remove unused argument from daemon_exit.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/tests/shell/daemon.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/perf/tests/shell/daemon.sh b/tools/perf/tests/shell/daemon.sh
index 5ad3ca8d681b..66ad56b4e0a5 100755
--- a/tools/perf/tests/shell/daemon.sh
+++ b/tools/perf/tests/shell/daemon.sh
@@ -115,8 +115,7 @@ daemon_start()
 
 daemon_exit()
 {
-	local base=$1
-	local config=$2
+	local config=$1
 
 	local line=`perf daemon --config ${config} -x: | head -1`
 	local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'`
@@ -171,7 +170,7 @@ EOF
 			 ${base}/session-time/ack "0"
 
 	# stop daemon
-	daemon_exit ${base} ${config}
+	daemon_exit ${config}
 
 	rm -rf ${base}
 	rm -f ${config}
@@ -288,7 +287,7 @@ EOF
 	done
 
 	# stop daemon
-	daemon_exit ${base} ${config}
+	daemon_exit ${config}
 
 	rm -rf ${base}
 	rm -f ${config}
@@ -333,7 +332,7 @@ EOF
 	fi
 
 	# stop daemon
-	daemon_exit ${base} ${config}
+	daemon_exit ${config}
 
 	# check that sessions are gone
 	if [ -d "/proc/${pid_size}" ]; then
@@ -374,7 +373,7 @@ EOF
 	perf daemon signal --config ${config}
 
 	# stop daemon
-	daemon_exit ${base} ${config}
+	daemon_exit ${config}
 
 	# count is 2 perf.data for signals and 1 for perf record finished
 	count=`ls ${base}/session-test/ | grep perf.data | wc -l`
@@ -420,7 +419,7 @@ EOF
 	fi
 
 	# stop daemon
-	daemon_exit ${base} ${config}
+	daemon_exit ${config}
 
 	rm -rf ${base}
 	rm -f ${config}
@@ -457,7 +456,7 @@ EOF
 	fi
 
 	# stop daemon
-	daemon_exit ${base} ${config}
+	daemon_exit ${config}
 
 	rm -rf ${base}
 	rm -f ${config}
-- 
2.31.0.rc2.261.g7f71774620-goog

[PATCH v2 2/3] perf test: Cleanup daemon if test is interrupted.

[Ian Rogers]

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>
---
 tools/perf/tests/shell/daemon.sh | 34 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/tools/perf/tests/shell/daemon.sh b/tools/perf/tests/shell/daemon.sh
index 66ad56b4e0a5..61d13c4c64b8 100755
--- a/tools/perf/tests/shell/daemon.sh
+++ b/tools/perf/tests/shell/daemon.sh
@@ -98,6 +98,23 @@ check_line_other()
 	fi
 }
 
+daemon_exit()
+{
+	local config=$1
+
+	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}
+
+	# ... and wait for the pid to go away
+	tail --pid=${pid} -f /dev/null
+}
+
 daemon_start()
 {
 	local config=$1
@@ -105,6 +122,9 @@ daemon_start()
 
 	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
@@ -113,20 +133,6 @@ daemon_start()
 	done
 }
 
-daemon_exit()
-{
-	local config=$1
-
-	local line=`perf daemon --config ${config} -x: | head -1`
-	local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'`
-
-	# stop daemon
-	perf daemon stop --config ${config}
-
-	# ... and wait for the pid to go away
-	tail --pid=${pid} -f /dev/null
-}
-
 test_list()
 {
 	echo "test daemon list"
-- 
2.31.0.rc2.261.g7f71774620-goog

[PATCH v2 3/3] perf test: Add 30s timeout for wait for daemon start.

[Ian Rogers]

Retry the ping loop upto 600 times, or approximately 30 seconds, to make
sure the test does hang at start up.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/tests/shell/daemon.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/perf/tests/shell/daemon.sh b/tools/perf/tests/shell/daemon.sh
index 61d13c4c64b8..ee4a30ca3f57 100755
--- a/tools/perf/tests/shell/daemon.sh
+++ b/tools/perf/tests/shell/daemon.sh
@@ -127,9 +127,16 @@ daemon_start()
 
 	# wait for the session to ping
 	local state="FAIL"
+	local retries=0
 	while [ "${state}" != "OK" ]; do
 		state=`perf daemon ping --config ${config} --session ${session} | awk '{ print $1 }'`
 		sleep 0.05
+		retries=$((${retries} +1))
+		if [ ${retries} -ge 600 ]; then
+			echo "FAILED: Timeout waiting for daemon to ping"
+			daemon_exit ${config}
+			exit 1
+		fi
 	done
 }
 
-- 
2.31.0.rc2.261.g7f71774620-goog

Re: [PATCH v2 1/3] perf test: Remove unused argument

[Jiri Olsa]

On Tue, Mar 16, 2021 at 05:55:03PM -0700, Ian Rogers wrote:
> Remove unused argument from daemon_exit.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>

for the patchset

Acked-by: Jiri Olsa <jolsa@redhat.com>

thanks,
jirka


> ---
>  tools/perf/tests/shell/daemon.sh | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/tools/perf/tests/shell/daemon.sh b/tools/perf/tests/shell/daemon.sh
> index 5ad3ca8d681b..66ad56b4e0a5 100755
> --- a/tools/perf/tests/shell/daemon.sh
> +++ b/tools/perf/tests/shell/daemon.sh
> @@ -115,8 +115,7 @@ daemon_start()
>  
>  daemon_exit()
>  {
> -	local base=$1
> -	local config=$2
> +	local config=$1
>  
>  	local line=`perf daemon --config ${config} -x: | head -1`
>  	local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'`
> @@ -171,7 +170,7 @@ EOF
>  			 ${base}/session-time/ack "0"
>  
>  	# stop daemon
> -	daemon_exit ${base} ${config}
> +	daemon_exit ${config}
>  
>  	rm -rf ${base}
>  	rm -f ${config}
> @@ -288,7 +287,7 @@ EOF
>  	done
>  
>  	# stop daemon
> -	daemon_exit ${base} ${config}
> +	daemon_exit ${config}
>  
>  	rm -rf ${base}
>  	rm -f ${config}
> @@ -333,7 +332,7 @@ EOF
>  	fi
>  
>  	# stop daemon
> -	daemon_exit ${base} ${config}
> +	daemon_exit ${config}
>  
>  	# check that sessions are gone
>  	if [ -d "/proc/${pid_size}" ]; then
> @@ -374,7 +373,7 @@ EOF
>  	perf daemon signal --config ${config}
>  
>  	# stop daemon
> -	daemon_exit ${base} ${config}
> +	daemon_exit ${config}
>  
>  	# count is 2 perf.data for signals and 1 for perf record finished
>  	count=`ls ${base}/session-test/ | grep perf.data | wc -l`
> @@ -420,7 +419,7 @@ EOF
>  	fi
>  
>  	# stop daemon
> -	daemon_exit ${base} ${config}
> +	daemon_exit ${config}
>  
>  	rm -rf ${base}
>  	rm -f ${config}
> @@ -457,7 +456,7 @@ EOF
>  	fi
>  
>  	# stop daemon
> -	daemon_exit ${base} ${config}
> +	daemon_exit ${config}
>  
>  	rm -rf ${base}
>  	rm -f ${config}
> -- 
> 2.31.0.rc2.261.g7f71774620-goog
> 

Re: [PATCH v2 1/3] perf test: Remove unused argument

[Arnaldo Carvalho de Melo]

Em Thu, Mar 18, 2021 at 02:01:49PM +0100, Jiri Olsa escreveu:
> On Tue, Mar 16, 2021 at 05:55:03PM -0700, Ian Rogers wrote:
> > Remove unused argument from daemon_exit.
> > 
> > Signed-off-by: Ian Rogers <irogers@google.com>
> 
> for the patchset
> 
> Acked-by: Jiri Olsa <jolsa@redhat.com>

Thanks, added to the csets I had applied already in my local repo.

- Arnaldo