run-workload move trap commands into function

This hopefully will make it easier to maintain.
osdldbt · Apr 25, 2023 · a6de000 · a6de000
1 parent fe61c8b
commit a6de000
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/scripts/dbt2-run-workload b/src/scripts/dbt2-run-workload
@@ -6,11 +6,6 @@
 # Copyright The DBT-2 Authors
 #
 
-trap 'echo "Test was interrupted by Control-C."; \
-	killall dbt2-client dbt2-driver sar sadc pidstat; dbt2-${DBMS}-stop-db; killall dbt2-${DBMS}-db-stat sar sadc pidstat' INT
-trap 'echo "Test was interrupted. Got TERM signal."; \
-	killall dbt2-client dbt2-driver sar sadc pidstat; dbt2-${DBMS}-stop-db; killall dbt2-${DBMS}-db-stat sar sadc pidstat' TERM
-
 do_sleep()
 {
 	echo "Sleeping $1 seconds"
@@ -314,6 +309,15 @@ readprofile_clear()
 	${COMMAND} sudo /usr/sbin/readprofile -r
 }
 
+stop_processes() {
+	killall dbt2-client dbt2-driver sar sadc pidstat
+	"dbt2-${DBMS}-stop-db"
+	killall "dbt2-${DBMS}-db-stat" sar sadc pidstat
+}
+
+trap 'echo "Test was interrupted by Control-C."; stop_processes' INT
+trap 'echo "Test was interrupted. Got TERM signal."; stop_processes' TERM
+
 usage()
 {
 	if [ "$1" != "" ]; then