moved pinghandler to correct if-branch, fixed script to reliably log times

Author: RaghavRoy145

http-responsiveness-server/Examples/ping-benchmarks/collect_benchmarks.sh

@@ -6,7 +6,7 @@
 #   Reads “Request handled in XX ms” lines from a SwiftNIO HTTPResponsivenessServer
 #   log file (produced when started with --collect-benchmarks) and computes
 #   p0, p25, p50, p75, p90, p99 and p100 statistics.
-#   
+#
 #   Called from run_benchmarks.sh
 #
 #
@@ -24,7 +24,7 @@ SAMPLES="$3"
 
 # extract exactly the first N timings
 mapfile -t times < <(
-  grep "Request handled in" "$LOGFILE" \
+  grep -a "Request handled in" "$LOGFILE" \
     | head -n "$SAMPLES" \
     | sed -E 's/.*Request handled in ([0-9]+(\.[0-9]+)?) ms/\1/'
 )

http-responsiveness-server/Examples/ping-benchmarks/run_benchmarks.sh

@@ -3,29 +3,29 @@
 # run_benchmarks.sh
 #
 # Description:
-# Sends HTTP GETs to a running HTTPResponsivenessServer (started with --collect-benchmarks)
-# then invokes collect-benchmarks.sh on its log.
+#   Sends HTTP GETs to a running HTTPResponsivenessServer (started with --collect-benchmarks)
+#   then invokes collect_benchmarks.sh on its log.
 #
 # Prerequisites:
-#   1. Build your server with benchmarking support:
+#   1. Build your server:
 #        swift build -c release
 #
 #   2. Start it in the background, redirecting stdout+stderr to a log:
-#        .build/release/HTTPResponsivenessServer \
-#          --host 127.0.0.1 \
-#          --insecure-port 8080 \
-#          --collect-benchmarks \
-#        > server.log 2>&1 &
+#
+#      stdbuf -oL -eL .build/release/HTTPResponsivenessServer \
+#      --host 127.0.0.1 \
+#      --insecure-port 8080 \
+#      --collect-benchmarks \
+#      &> server.log
 #
 # Usage:
 #   In the root directory of this App
-#
-#   Examples/ping-benchmarks/run_benchmarks.sh \
-#     --host 127.0.0.1 \
-#     --port 8080 \
-#     --endpoint /ping \
-#     --samples 100 \
-#     --logfile server.log
+#     Examples/ping-benchmarks/run_benchmarks.sh \
+#       --host 127.0.0.1 \
+#       --port 8080 \
+#       --endpoint /ping \
+#       --samples 100 \
+#       --logfile server.log
 #
 
 set -euo pipefail
@@ -38,17 +38,53 @@ while [[ $# -gt 0 ]]; do
     --endpoint)  ENDPOINT="$2"; shift 2 ;;
     --samples)   SAMPLES="$2";  shift 2 ;;
     --logfile)   LOGFILE="$2";  shift 2 ;;
-    *) echo "Unknown argument: $1" >&2; exit 1 ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      exit 1
+      ;;
   esac
 done
 
+# --- sanity check logfile ---
+if [[ ! -f "$LOGFILE" ]]; then
+  cat <<EOF >&2
+ERROR: logfile '$LOGFILE' not found.
+Make sure you started the server with:
+
+  stdbuf -oL -eL .build/release/HTTPResponsivenessServer --host $HOST --insecure-port $PORT --collect-benchmarks &> $LOGFILE
+
+EOF
+  exit 1
+fi
+
+# --- clear out any old measurements ---
+: > "$LOGFILE"
+
 echo "→ Sending $SAMPLES requests to http://$HOST:$PORT$ENDPOINT"
 for i in $(seq 1 "$SAMPLES"); do
   curl -s "http://$HOST:$PORT$ENDPOINT" > /dev/null
 done
 
-# give the server a moment to flush
+# give the server a moment to log
 sleep 0.1
 
-# hand off to the collector
+# --- wait for exactly SAMPLES log entries ---
+echo "→ Waiting up to 5s for $SAMPLES entries in '$LOGFILE' …"
+deadline=$((SECONDS + 5))
+while (( SECONDS < deadline )); do
+  count=$(grep -c "Request handled in" "$LOGFILE" || true)
+  if (( count >= SAMPLES )); then
+    break
+  fi
+  sleep 0.1
+done
+
+# final check
+count=$(grep -c "Request handled in" "$LOGFILE" || true)
+if (( count < SAMPLES )); then
+  echo "ERROR: only found $count samples in '$LOGFILE' (wanted $SAMPLES)" >&2
+  exit 1
+fi
+
+echo "→ Collected $count samples, now computing percentiles…"
 Examples/ping-benchmarks/collect_benchmarks.sh "$LOGFILE" "$ENDPOINT" "$SAMPLES"

http-responsiveness-server/Sources/HTTPResponsivenessServer/main.swift

@@ -93,7 +93,7 @@ final class PingHandler: ChannelInboundHandler {
             return
 
         case .end where handlingPing:
-            // ping is done; forward the .end so measurement & mux see it
+            // ping is done
             handlingPing = false
             return
 
@@ -180,8 +180,8 @@ func channelInitializer(
             .flatMapThrowing { _ in
                 if collectBenchmarks {
                     try channel.pipeline.syncOperations.addHandler(PerformanceMeasurementHandler())
+                    try channel.pipeline.syncOperations.addHandler(PingHandler())
                 }
-                try channel.pipeline.syncOperations.addHandler(PingHandler())
                 try channel.pipeline.syncOperations.addHandler(
                     SimpleResponsivenessRequestMux(responsivenessConfigBuffer: config)
                 )