test-case: Implement one common method for kill process

Implement one common method for kill process in lib.sh
Replace all kill -9 with kill_process() function in tests.
Method kill_process() try kill -15 first and as a last resort do kill -9.

Signed-off-by: Szymon Richert <szymon1.richert@intel.com>

Author: SzymonRichert

case-lib/lib.sh

@@ -945,6 +945,29 @@ check_alsa_tool_process()
     esac
 }
 
+kill_process()
+{
+    local pid="$1"
+
+    [[ -n "$pid" ]] || {
+        dloge "kill_process: missing pid"
+        return 1
+    }
+
+    kill -0 "$pid" 2>/dev/null || return 0
+
+    kill -15 "$pid" 2>/dev/null || true
+    sleep 1
+
+    kill -0 "$pid" 2>/dev/null || return 0
+
+    kill -9 "$pid" 2>/dev/null || true
+
+    kill -0 "$pid" 2>/dev/null && return 1
+
+    return 0
+}
+
 aplay_opts()
 {
     if [[ "$SOF_ALSA_TOOL" = "tinyalsa" ]]; then

test-case/check-runtime-pm-double-active.sh

@@ -113,8 +113,9 @@ do
         dlogi "runtime status: $result"
         if [[ $result == active ]]; then
             # stop playback or capture device - check status again
-            dlogc "kill process: kill -9 $pid"
-            kill -9 $pid && wait $pid 2>/dev/null
+            dlogc "kill process: $pid"
+            kill_process "$pid" || true
+            wait "$pid" 2>/dev/null || true
             dlogi "$cmd killed"
 
             # check runtime pm status with maxmium timeout value, it will exit if dsp is not suspended
@@ -125,8 +126,9 @@ do
         else
             dloge "$cmd process for pcm $pcm runtime status is not active as expected"
             # stop playback or capture device otherwise no one will stop this $cmd.
-            dlogc "kill process: kill -9 $pid"
-            kill -9 $pid && wait $pid 2>/dev/null
+            dlogc "kill process: $pid"
+            kill_process "$pid" || true
+            wait "$pid" 2>/dev/null || true
             func_lib_lsof_error_dump $snd
             exit 1
         fi

test-case/check-runtime-pm-status.sh

@@ -109,8 +109,9 @@ do
         dlogi "runtime status: $result"
         if [[ $result == active ]]; then
             # stop playback or capture device - check status again
-            dlogc "kill process: kill -9 $pid"
-            kill -9 $pid && wait $pid 2>/dev/null
+            dlogc "kill process: $pid"
+            kill_process "$pid" || true
+            wait "$pid" 2>/dev/null || true
             dlogi "$cmd killed"
             func_check_dsp_status ${OPT_VAL['d']}
             result=`sof-dump-status.py --dsp_status 0`
@@ -123,8 +124,9 @@ do
         else
             dloge "$cmd process for pcm $pcm runtime status is not active as expected"
             # stop playback or capture device otherwise no one will stop this $cmd.
-            dlogc "kill process: kill -9 $pid"
-            kill -9 $pid && wait $pid 2>/dev/null
+            dlogc "kill process: $pid"
+            kill_process "$pid" || true
+            wait "$pid" 2>/dev/null || true
             func_lib_lsof_error_dump $snd
             exit 1
         fi

test-case/check-signal-stop-start.sh

@@ -70,7 +70,7 @@ func_stop_start_pipeline()
         # check aplay/arecord process state
         sof-process-state.sh "$pid" >/dev/null || {
             dloge "$cmd($pid) process is in an abnormal status"
-            kill -9 "$pid"
+            kill_process "$pid" || true
             exit 1
         }
         dlogi "Stop/start count: $i"
@@ -116,8 +116,8 @@ do
     func_stop_start_pipeline
 
     # kill aplay/arecord process
-    dlogc "kill process: kill -9 $pid"
-    kill -9 "$pid"
+    dlogc "kill process: $pid"
+    kill_process "$pid" || true
 done
 
 sof-kernel-log-check.sh "$KERNEL_CHECKPOINT"

test-case/check-suspend-resume-with-audio.sh

@@ -137,6 +137,6 @@ do
         exit 1
     }
     dlogi "Killing $cmd_args"
-    kill -9 $process_id || true
+    kill_process "$process_id" || true
 done
 

test-case/check-userspace-paplay.sh

@@ -108,7 +108,7 @@ for round in $(seq 1 $round_cnt); do
             else
                 dlogi "paplay runs successfully"
                 # kill all paplay process
-                kill -9 $pid
+                kill_process "$pid" || true
                 sleep 0.5
             fi
         fi

test-case/check-userspace-parecord.sh

@@ -115,7 +115,7 @@ for round in $(seq 1 $round_cnt); do
             else
                 dlogi "parecord runs successfully"
                 # kill all parecord processes
-                kill -9 $pid
+                kill_process "$pid" || true
                 sleep 0.5
             fi
         fi

test-case/check-volume-levels.sh

@@ -83,7 +83,7 @@ main () {
     # Stop sine playback and do cleanup
     nap
     dlogi "The test procedure is now complete. Killing the aplay process $aplayPID."
-    kill $aplayPID
+    kill_process "$aplayPID" || true
 
     # Measure, delete unnecessary wav files if passed
     if measure_levels; then

test-case/check-xrun-injection.sh

@@ -72,7 +72,8 @@ func_xrun_injection()
         # check aplay/arecord process state
         sof-process-state.sh "$pid" >/dev/null || {
             dloge "aplay/arecord process is in an abnormal status"
-            kill -9 "$pid" && wait "$pid" 2>/dev/null
+            kill_process "$pid" || true
+            wait "$pid" 2>/dev/null || true
             exit 1
         }
         dlogi "XRUN injection: $i"
@@ -119,8 +120,9 @@ do
     dlogc "echo 1 > $xrun_injection"
     func_xrun_injection
     # kill aplay/arecord process
-    dlogc "kill process: kill -9 $pid"
-    kill -9 $pid && wait $pid 2>/dev/null
+    dlogc "kill process: $pid"
+    kill_process "$pid" || true
+    wait "$pid" 2>/dev/null || true
 done
 
 sof-kernel-log-check.sh "$KERNEL_CHECKPOINT"

test-case/multiple-pipeline.sh

@@ -127,8 +127,10 @@ func_error_exit()
 {
     dloge "$*"
 
-    pgrep -a aplay   &&  pkill -9 aplay
-    pgrep -a arecord &&  pkill -9 arecord
+    pgrep -a aplay &&
+        while read -r pid; do kill_process "$pid" || true; done < <(pgrep -x aplay)
+    pgrep -a arecord &&
+        while read -r pid; do kill_process "$pid" || true; done < <(pgrep -x arecord)
 
     exit 1
 }
@@ -208,9 +210,9 @@ do
     dlogi "checking pipeline status again"
     ps_checks
 
-    dlogc 'pkill -9 aplay arecord'
-    pkill -9 arecord || true
-    pkill -9 aplay   || true
+    dlogc 'kill_process all aplay/arecord pids'
+    while read -r pid; do kill_process "$pid" || true; done < <(pgrep -x arecord)
+    while read -r pid; do kill_process "$pid" || true; done < <(pgrep -x aplay)
     sleep 1 # try not to pollute the next iteration
 
     if pgrep arecord || pgrep aplay; then