Skip to contentSkip to conversation

perf test: Add tests/shell/lib/waiting.sh

PATCH Applied Adrian Hunter 3 participants 6 messages Sep 14, 2022 – Sep 26, 2022 perf events

lore
Share & tools
lore

Adrian Hunter

author reviewer
#0 lore raw

cover perf test: Add tests/shell/lib/waiting.sh

Hi

As requested by Namhyung, move functions from test_intel_pt.sh to tests/shell/lib/waiting.sh, and parameterize timeouts.

Adrian Hunter (2):
perf test: test_intel_pt.sh: Move helper functions for waiting perf test: waiting.sh: Parameterize timeouts

 tools/perf/tests/shell/lib/waiting.sh   | 77 +++++++++++++++++++++++++++++++++
 tools/perf/tests/shell/test_intel_pt.sh | 68 ++---------------------------
 2 files changed, 81 insertions(+), 64 deletions(-)
 create mode 100644 tools/perf/tests/shell/lib/waiting.sh

Regards
Adrian

author reviewer
#1 lore raw

PATCH 1/2 perf test: test_intel_pt.sh: Move helper functions for waiting

Move helper functions for waiting to a separate file so they can be shared.

---
 tools/perf/tests/shell/lib/waiting.sh   | 69 +++++++++++++++++++++++++
 tools/perf/tests/shell/test_intel_pt.sh | 68 ++----------------------
 2 files changed, 73 insertions(+), 64 deletions(-)
 create mode 100644 tools/perf/tests/shell/lib/waiting.sh
tools/perf/tests/shell/lib/waiting.sh new file +69 -0
new file mode 100644
index 000000000000..dbd5bd90105e
@@ -0,0 +1,69 @@
+# SPDX-License-Identifier: GPL-2.0
+
+tenths=date\ +%s%1N
+
+# Wait for PID $1 to have $2 number of threads started
+wait_for_threads()
+{
+	start_time=$($tenths)
+	while [ -e "/proc/$1/task" ] ; do
+		th_cnt=$(find "/proc/$1/task" -mindepth 1 -maxdepth 1 -printf x | wc -c)
+		if [ "${th_cnt}" -ge "$2" ] ; then
+			return 0
+		fi
+		# Wait at most 5 seconds
+		if [ $(($($tenths) - start_time)) -ge 50 ] ; then
+			echo "PID $1 does not have $2 threads"
+			return 1
+		fi
+	done
+	return 1
+}
+
+# Wait for perf record -vvv 2>$2 with PID $1 to start by looking at file $2
+# It depends on capturing perf record debug message "perf record has started"
+wait_for_perf_to_start()
+{
+	echo "Waiting for \"perf record has started\" message"
+	start_time=$($tenths)
+	while [ -e "/proc/$1" ] ; do
+		if grep -q "perf record has started" "$2" ; then
+			echo OK
+			break
+		fi
+		# Wait at most 5 seconds
+		if [ $(($($tenths) - start_time)) -ge 50 ] ; then
+			echo "perf recording did not start"
+			return 1
+		fi
+	done
+	return 0
+}
+
+# Wait for process PID %1 to exit
+wait_for_process_to_exit()
+{
+	start_time=$($tenths)
+	while [ -e "/proc/$1" ] ; do
+		# Wait at most 5 seconds
+		if [ $(($($tenths) - start_time)) -ge 50 ] ; then
+			echo "PID $1 did not exit as expected"
+			return 1
+		fi
+	done
+	return 0
+}
+
+# Check if PID $1 is still running after 0.3 seconds
+is_running()
+{
+	start_time=$($tenths)
+	while [ -e "/proc/$1" ] ; do
+		# Check for at least 0.3s
+		if [ $(($($tenths) - start_time)) -gt 3 ] ; then
+			return 0
+		fi
+	done
+	echo "PID $1 exited prematurely"
+	return 1
+}
tools/perf/tests/shell/test_intel_pt.sh +4 -64

89 lines not on this page · raw message

Signature · 1 line
2.25.1
author reviewer
#2 lore raw

PATCH 2/2 perf test: waiting.sh: Parameterize timeouts

In reply to Adrian Hunter

Let helper functions accept a parameter to specify time out values in tenths of a second.

---
 tools/perf/tests/shell/lib/waiting.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
tools/perf/tests/shell/lib/waiting.sh +17 -9
index dbd5bd90105e..e7a39134a68e 100644
@@ -3,16 +3,18 @@
 tenths=date\ +%s%1N
 
 # Wait for PID $1 to have $2 number of threads started
+# Time out after $3 tenths of a second or 5 seconds if $3 is ""
 wait_for_threads()
 {
+	tm_out=$3 ; [ -n "${tm_out}" ] || tm_out=50
 	start_time=$($tenths)
 	while [ -e "/proc/$1/task" ] ; do
 		th_cnt=$(find "/proc/$1/task" -mindepth 1 -maxdepth 1 -printf x | wc -c)
 		if [ "${th_cnt}" -ge "$2" ] ; then
 			return 0
 		fi
-		# Wait at most 5 seconds
-		if [ $(($($tenths) - start_time)) -ge 50 ] ; then
+		# Wait at most tm_out tenths of a second
+		if [ $(($($tenths) - start_time)) -ge $tm_out ] ; then
 			echo "PID $1 does not have $2 threads"
 			return 1
 		fi
@@ -22,8 +24,10 @@ wait_for_threads()
 
 # Wait for perf record -vvv 2>$2 with PID $1 to start by looking at file $2
 # It depends on capturing perf record debug message "perf record has started"
+# Time out after $3 tenths of a second or 5 seconds if $3 is ""
 wait_for_perf_to_start()
 {
+	tm_out=$3 ; [ -n "${tm_out}" ] || tm_out=50
 	echo "Waiting for \"perf record has started\" message"
 	start_time=$($tenths)
 	while [ -e "/proc/$1" ] ; do
@@ -31,8 +35,8 @@ wait_for_perf_to_start()
 			echo OK
 			break
 		fi
-		# Wait at most 5 seconds
-		if [ $(($($tenths) - start_time)) -ge 50 ] ; then
+		# Wait at most tm_out tenths of a second
+		if [ $(($($tenths) - start_time)) -ge $tm_out ] ; then
 			echo "perf recording did not start"
 			return 1
 		fi
@@ -41,12 +45,14 @@ wait_for_perf_to_start()
 }
 
 # Wait for process PID %1 to exit
+# Time out after $2 tenths of a second or 5 seconds if $2 is ""
 wait_for_process_to_exit()
 {
+	tm_out=$2 ; [ -n "${tm_out}" ] || tm_out=50
 	start_time=$($tenths)
 	while [ -e "/proc/$1" ] ; do
-		# Wait at most 5 seconds
-		if [ $(($($tenths) - start_time)) -ge 50 ] ; then
+		# Wait at most tm_out tenths of a second
+		if [ $(($($tenths) - start_time)) -ge $tm_out ] ; then
 			echo "PID $1 did not exit as expected"
 			return 1
 		fi
@@ -54,13 +60,15 @@ wait_for_process_to_exit()
 	return 0
 }
 
-# Check if PID $1 is still running after 0.3 seconds
+# Check if PID $1 is still running after $2 tenths of a second
+# or 0.3 seconds if $2 is ""
 is_running()
 {
+	tm_out=$2 ; [ -n "${tm_out}" ] || tm_out=3
 	start_time=$($tenths)
 	while [ -e "/proc/$1" ] ; do
-		# Check for at least 0.3s
-		if [ $(($($tenths) - start_time)) -gt 3 ] ; then
+		# Check for at least tm_out tenths of a second
+		if [ $(($($tenths) - start_time)) -gt $tm_out ] ; then
 			return 0
 		fi
 	done
Signature · 1 line
2.25.1
author reviewer
#3 lore raw
In reply to Adrian Hunter
Quoted 4 lines · Adrian Hunter

Hi

As requested by Namhyung, move functions from test_intel_pt.sh to tests/shell/lib/waiting.sh, and parameterize timeouts.

This is on top of series "perf test: test_intel_pt.sh: Add per-thread test"

	https://lore.kernel.org/lkml/[email protected]/

For Namhyung's comments refer also:

https://lore.kernel.org/lkml/CAM9d7ci3JKNaLDMo6patFHZbLSm-r1UmOmZtrwCX8Gu0nsPMBA@mail.gmail.com/
https://lore.kernel.org/lkml/CAM9d7ciRCnpNjOfoEbO27pNk28ddjg1vVdgrZtvWQ-mbD7jg0w@mail.gmail.com/

Quoted 14 lines

Adrian Hunter (2):
perf test: test_intel_pt.sh: Move helper functions for waiting perf test: waiting.sh: Parameterize timeouts

 tools/perf/tests/shell/lib/waiting.sh   | 77 +++++++++++++++++++++++++++++++++
 tools/perf/tests/shell/test_intel_pt.sh | 68 ++---------------------------
 2 files changed, 81 insertions(+), 64 deletions(-)
 create mode 100644 tools/perf/tests/shell/lib/waiting.sh

Regards
Adrian

maintainer Acked-by on the v1 series
#4 lore raw
In reply to Adrian Hunter
Quoted 10 lines · Adrian Hunter

Hi

As requested by Namhyung, move functions from test_intel_pt.sh to tests/shell/lib/waiting.sh, and parameterize timeouts.

Adrian Hunter (2):
perf test: test_intel_pt.sh: Move helper functions for waiting perf test: waiting.sh: Parameterize timeouts

Thanks,
Namhyung

Quoted 9 lines
 tools/perf/tests/shell/lib/waiting.sh   | 77 +++++++++++++++++++++++++++++++++
 tools/perf/tests/shell/test_intel_pt.sh | 68 ++---------------------------
 2 files changed, 81 insertions(+), 64 deletions(-)
 create mode 100644 tools/perf/tests/shell/lib/waiting.sh

Regards
Adrian

maintainer Applied
#5 lore raw

Em Wed, Sep 14, 2022 at 09:41:09AM -0700, Namhyung Kim escreveu:

Quoted 8 lines · Adrian Hunter
Quoted 7 lines

Hi

As requested by Namhyung, move functions from test_intel_pt.sh to tests/shell/lib/waiting.sh, and parameterize timeouts.

Quoted 5 lines
Quoted 3 lines

Adrian Hunter (2):
perf test: test_intel_pt.sh: Move helper functions for waiting perf test: waiting.sh: Parameterize timeouts

Thanks, applied.

- Arnaldo

Quoted 13 lines

Thanks,
Namhyung

Quoted 9 lines
 tools/perf/tests/shell/lib/waiting.sh   | 77 +++++++++++++++++++++++++++++++++
 tools/perf/tests/shell/test_intel_pt.sh | 68 ++---------------------------
 2 files changed, 81 insertions(+), 64 deletions(-)
 create mode 100644 tools/perf/tests/shell/lib/waiting.sh

Regards
Adrian

Signature · 1 line
- Arnaldo