From 1fabfd5a32ce850912ce623eeabd369b59c70494 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Tue, 13 Apr 2021 17:59:11 +0200
Subject: afl-whatsup -d

---
 afl-whatsup | 45 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 11 deletions(-)

(limited to 'afl-whatsup')

diff --git a/afl-whatsup b/afl-whatsup
index e92b24bd..ee20fc2d 100755
--- a/afl-whatsup
+++ b/afl-whatsup
@@ -21,29 +21,37 @@
 echo "$0 status check tool for afl-fuzz by Michal Zalewski"
 echo
 test "$1" = "-h" -o "$1" = "-hh" && {
-  echo $0 [-s] output_directory
+  echo "$0 [-s] [-d] output_directory"
   echo
   echo Options:
   echo   -s  -  skip details and output summary results only
+  echo   -d  -  include dead fuzzer stats
   echo
   exit 1
 }
 
-if [ "$1" = "-s" ]; then
+unset SUMMARY_ONLY
+unset PROCESS_DEAD
 
-  SUMMARY_ONLY=1
-  DIR="$2"
+while [ "$1" = "-s" -o "$1" = "-d" ]; do
 
-else
+  if [ "$1" = "-s" ]; then
+    SUMMARY_ONLY=1
+  fi
 
-  unset SUMMARY_ONLY
-  DIR="$1"
+  if [ "$1" = "-d" ]; then
+    PROCESS_DEAD=1
+  fi
+  
+  shift
 
-fi
+done
+
+DIR="$1"
 
 if [ "$DIR" = "" ]; then
 
-  echo "Usage: $0 [ -s ] afl_sync_dir" 1>&2
+  echo "Usage: $0 [-s] [-d] afl_sync_dir" 1>&2
   echo 1>&2
   echo "The -s option causes the tool to skip all the per-fuzzer trivia and show" 1>&2
   echo "just the summary results. See docs/parallel_fuzzing.md for additional tips." 1>&2
@@ -160,7 +168,12 @@ for i in `find . -maxdepth 2 -iname fuzzer_stats | sort`; do
     fi
 
     DEAD_CNT=$((DEAD_CNT + 1))
-    continue
+
+    if [ "$PROCESS_DEAD" = "" ]; then
+
+      continue
+
+    fi
 
   fi
 
@@ -257,8 +270,18 @@ echo "============="
 echo
 echo "       Fuzzers alive : $ALIVE_CNT"
 
+if [ "$PROCESS_DEAD" = "" ]; then
+
+  TXT="excluded from stats"
+
+else
+
+  TXT="included in stats"
+
+fi
+
 if [ ! "$DEAD_CNT" = "0" ]; then
-  echo "      Dead or remote : $DEAD_CNT (excluded from stats)"
+  echo "      Dead or remote : $DEAD_CNT ($TXT)"
 fi
 
 echo "      Total run time : $FMT_TIME"
-- 
cgit 1.4.1


From 36c7c49738ae659868f70ea7d1b85804158b532f Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Tue, 13 Apr 2021 18:21:33 +0200
Subject: fix alive count in afl-whatsup

---
 afl-whatsup | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'afl-whatsup')

diff --git a/afl-whatsup b/afl-whatsup
index ee20fc2d..941b0e34 100755
--- a/afl-whatsup
+++ b/afl-whatsup
@@ -265,11 +265,6 @@ fmt_duration $TOTAL_LAST_PATH && TOTAL_LAST_PATH=$DUR_STRING
 
 test "$TOTAL_TIME" = "0" && TOTAL_TIME=1
 
-echo "Summary stats"
-echo "============="
-echo
-echo "       Fuzzers alive : $ALIVE_CNT"
-
 if [ "$PROCESS_DEAD" = "" ]; then
 
   TXT="excluded from stats"
@@ -277,9 +272,15 @@ if [ "$PROCESS_DEAD" = "" ]; then
 else
 
   TXT="included in stats"
+  ALIVE_CNT=$(($ALIVE_CNT - $DEAD_CNT))
 
 fi
 
+echo "Summary stats"
+echo "============="
+echo
+echo "       Fuzzers alive : $ALIVE_CNT"
+
 if [ ! "$DEAD_CNT" = "0" ]; then
   echo "      Dead or remote : $DEAD_CNT ($TXT)"
 fi
-- 
cgit 1.4.1


From 71f3d82d430cc82c0654083b8cd1d78d59f88ca9 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Thu, 15 Apr 2021 11:23:46 +0200
Subject: afl-whatsup -d fix

---
 afl-whatsup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'afl-whatsup')

diff --git a/afl-whatsup b/afl-whatsup
index 941b0e34..be259829 100755
--- a/afl-whatsup
+++ b/afl-whatsup
@@ -141,7 +141,7 @@ for i in `find . -maxdepth 2 -iname fuzzer_stats | sort`; do
   sed 's/^command_line.*$/_skip:1/;s/[ ]*:[ ]*/="/;s/$/"/' "$i" >"$TMP"
   . "$TMP"
 
-  RUN_UNIX=$((CUR_TIME - start_time))
+  RUN_UNIX=$run_time
   RUN_DAYS=$((RUN_UNIX / 60 / 60 / 24))
   RUN_HRS=$(((RUN_UNIX / 60 / 60) % 24))
 
@@ -168,6 +168,7 @@ for i in `find . -maxdepth 2 -iname fuzzer_stats | sort`; do
     fi
 
     DEAD_CNT=$((DEAD_CNT + 1))
+    last_path=0
 
     if [ "$PROCESS_DEAD" = "" ]; then
 
-- 
cgit 1.4.1