From 51021318201ba6150d1817852005ace88fdecc8d Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sat, 29 Dec 2012 09:30:42 -0600
Subject: [PATCH] sh/stopwatch: Show time difference since last lap or last
 restart

---
 lib/sh/stopwatch.sh | 17 +++++++++++++----
 test/stopwatch.sh   |  4 ++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/sh/stopwatch.sh b/lib/sh/stopwatch.sh
index 3257d7e..29844e2 100644
--- a/lib/sh/stopwatch.sh
+++ b/lib/sh/stopwatch.sh
@@ -80,6 +80,7 @@ stopwatch_set_message_callback <command>
     <command> - one of: starting, started, lap, get, stopping, stopped, reset
     <tag>     - stopwatch name
     <time>    - the current time on the stopwatch, if any
+    <delta>   - the time since the last change or inquiry (for lap and stopping)
   The commands are as follows:
     starting  - called start while stopped
     started   - called start while running
@@ -116,13 +117,14 @@ EOF
     command="${1}"
     tag="${2}"
     time="${3:+$(stopwatch_humany_duration ${3})}"
+    delta="${4:+$(stopwatch_humany_duration ${4})}"
     printf "Stopwatch: "
     case "${command}" in
     starting)  printf "'%s' starts%s.\n" "${tag}" "${time:+ at ${time}}";;
     started)   printf "'%s' is already running.\n" "${tag}" ;;
-    lap)       printf "'%s' is running: %s\n" "${tag}" "${time}" ;;
+    lap)       printf "'%s' is running: %s%s\n" "${tag}" "${time}" "${delta:+ (${delta} since last lap)}" ;;
     get)       printf "'%s' is stopped: %s\n" "${tag}" "${time}" ;;
-    stopping)  printf "'%s' stops at %s.\n" "${tag}" "${time}" ;;
+    stopping)  printf "'%s' stops at %s%s.\n" "${tag}" "${time}" "${delta:+ (${delta} since last start)}" ;;
     stopped)   printf "'%s' is stopped%s.\n" "${tag}" "${time:+ at ${time}}" ;;
     reset)     printf "'%s' is reset to zero.\n" "${tag}" ;;
     *)         printf "No message for command %s\n" "${command}" ;;
@@ -188,6 +190,7 @@ EOF
       # start the stopwatch
       accum="$(kvs_get stopwatch "${name}_accumulator")"
       kvs_set stopwatch "${name}" "${nao}"
+      [ "${accum}" ] && kvs_set stopwatch "${name}_laptime" "${nao}"
       eval "$(stopwatch_get_message_callback) starting ${name} ${accum}"
     fi
   }
@@ -203,9 +206,12 @@ EOF
       # emit a line indicating how long it has been running
       start="$(kvs_get stopwatch "${name}")"
       accum="$(kvs_get stopwatch "${name}_accumulator")"
+      laptm="$(kvs_get stopwatch "${name}_laptime")"
       delta="$(( ${nao} - ${start} ))"
+      [ "${laptm}" ] && laptm="$(( ${nao} - ${laptm} ))"
       [ "${accum}" ] && delta="$(( ${delta} + ${accum} ))"
-      eval "$(stopwatch_get_message_callback) lap ${name} ${delta}"
+      kvs_set stopwatch "${name}_laptime" "${nao}"
+      eval "$(stopwatch_get_message_callback) lap ${name} ${delta} ${laptm}"
     else
       accum="$(kvs_get stopwatch "${name}_accumulator")"
       eval "$(stopwatch_get_message_callback) get ${name} ${accum}"
@@ -222,10 +228,12 @@ EOF
       start="$(kvs_get stopwatch "${name}")"
       accum="$(kvs_get stopwatch "${name}_accumulator")"
       delta="$(( ${nao} - ${start} ))"
+      diffs="${delta}"
       [ "${accum}" ] && delta="$(( ${delta} + ${accum} ))"
       kvs_set stopwatch "${name}_accumulator" "${delta}"
       kvs_unset stopwatch "${name}"
-      eval "$(stopwatch_get_message_callback) stopping ${name} ${delta}"
+      kvs_unset stopwatch "${name}_laptime"
+      eval "$(stopwatch_get_message_callback) stopping ${name} ${delta} ${diffs}"
     else
       accum="$(kvs_get stopwatch "${name}_accumulator")"
       eval "$(stopwatch_get_message_callback) stopped ${name} ${accum}"
@@ -238,6 +246,7 @@ EOF
     [ "${nao}" ] || nao="$(_stopwatch_usec)"
     kvs_unset stopwatch "${name}"
     kvs_unset stopwatch "${name}_accumulator"
+    kvs_unset stopwatch "${name}_laptime"
     eval "$(stopwatch_get_message_callback) reset ${name}"
   }
 
diff --git a/test/stopwatch.sh b/test/stopwatch.sh
index 992c6d9..466ce61 100644
--- a/test/stopwatch.sh
+++ b/test/stopwatch.sh
@@ -37,6 +37,10 @@ stopwatch test stop
 sleep 5
 stopwatch test start
 sleep 5
+stopwatch test lap
+sleep 5
+stopwatch test lap
+sleep 5
 stopwatch test stop
 sleep 5
 stopwatch test reset
-- 
2.42.0