Fix for occasionally freezes when enable the profiler

lib/libexec.sh

@@ -1,4 +1,4 @@
-#shellcheck shell=sh
+#shellcheck shell=sh disable=SC2004
 
 [ "${ZSH_VERSION:-}" ] && setopt shwordsplit
 
@@ -96,4 +96,16 @@ abort() {
   exit 1
 }
 
+sleep_wait() {
+  case $1 in
+    *[!0-9]*) timeout=999999999 ;;
+    *) timeout=$1; shift
+  esac
+  while "$@"; do
+    [ "$timeout" -gt 0 ] || return 1
+    sleep 0
+    timeout=$(($timeout - 1))
+  done
+}
+
 use puts putsn

lib/libexec/runner.sh

@@ -23,15 +23,3 @@ read_pid_file() {
     eval "read -r $1 < \"$2\""
   fi
 }
-
-sleep_wait() {
-  case $1 in
-    *[!0-9]*) timeout=999999999 ;;
-    *) timeout=$1; shift
-  esac
-  while "$@"; do
-    [ "$timeout" -gt 0 ] || return 1
-    sleep 0
-    timeout=$(($timeout - 1))
-  done
-}

libexec/shellspec-profiler.sh

@@ -16,16 +16,20 @@ terminate() {
     echo "$(($end - $start))" >> "$SHELLSPEC_PROFILER_LOG"
     i=$(($i + 2))
   done
-  rm "$SHELLSPEC_TMPBASE/profiler.pid"
   exit
 }
 
+finished() {
+  : > "$SHELLSPEC_TMPBASE/profiler.done"
+}
+
 : > "$SHELLSPEC_PROFILER_LOG"
 
 pid=''
 if ( trap - USR1 && trap - TERM ) 2>/dev/null; then
   trap handler USR1
   trap terminate TERM
+  trap finished EXIT
   pid=$$
 fi
 echo "$pid" > "$SHELLSPEC_TMPBASE/profiler.pid"

libexec/shellspec-reporter.sh

@@ -148,9 +148,7 @@ read_time_log "time" "$SHELLSPEC_TIME_LOG"
 
 if [ "$SHELLSPEC_PROFILER" ] && [ "$SHELLSPEC_PROFILER_LOG" ]; then
   mkdir -p "$SHELLSPEC_REPORTDIR"
-  while shellspec_signal -0 "$SHELLSPEC_PROFILER_PID" 2>/dev/null; do
-    sleep 0
-  done
+  sleep_wait 1000 [ ! -e "$SHELLSPEC_TMPBASE/profiler.done" ] ||:
   callback() {
     eval "profiler_tick$1=\$2 profiler_time$1=\$3" \
       "profiler_line=\$profiler_line$1 profiler_count=$(($1 + 1))"

libexec/shellspec-runner.sh

@@ -20,7 +20,7 @@ start_profiler() {
 stop_profiler() {
   [ "$SHELLSPEC_PROFILER_PID" ] || return 0
   signal -TERM "$SHELLSPEC_PROFILER_PID" 2>/dev/null ||:
-  sleep_wait 1000 [ -e "$SHELLSPEC_TMPBASE/profiler.pid" ] ||:
+  sleep_wait [ ! -e "$SHELLSPEC_TMPBASE/profiler.done" ] ||:
   SHELLSPEC_PROFILER_PID=''
 }