From 53deba3d63c84bef9146dea3b52ef185c6871691 Mon Sep 17 00:00:00 2001 From: Louwrentius Date: Sat, 13 Feb 2010 23:00:49 +0000 Subject: [PATCH] PPSS now reports total processing time. --- ppss | 15 +++++++++++++-- ppss-test.sh | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ppss b/ppss index d65b46a..1e98149 100755 --- a/ppss +++ b/ppss @@ -25,7 +25,7 @@ trap 'kill_process' SIGINT # Setting some vars. SCRIPT_NAME="Distributed Parallel Processing Shell Script" -SCRIPT_VERSION="2.56b2" +SCRIPT_VERSION="2.56b3" # The first argument to this script can be a mode. MODES="node start config stop pause continue deploy status erase kill" @@ -68,6 +68,8 @@ PROCESSORS="" STOP_KEY="$RANDOM$RANDOM$RANDOM" # This is a signal to the listener to stop. KILL_KEY="$RANDOM$RANDOM$RANDOM" # This is a signal to stop immediately and kill RECURSION="1" # all running processes. +START_PPSS="$(date +%s)" +STOP_PPSS="" SSH_SERVER="" # Remote server or 'master'. SSH_KEY="" # SSH key for ssh account. @@ -1372,6 +1374,12 @@ start_single_worker () { fi } +stop-ppss () { + + STOP_PPSS="$(date +%s)" + elapsed "$START_PPSS" "$STOP_PPSS" +} + elapsed () { @@ -1386,7 +1394,8 @@ elapsed () { SECS="$(expr $REMAINDER % 60)" MINS="$(expr $(expr $REMAINDER - $SECS) / 60)" - echo "Elapsed time (h:m:s): $HOURS:$MINS:$SECS" + RES=`printf 'Total processing time: %02d:%02d:%02d' $HOURS $MINS $SECS` + log DSPLY "$RES" } commando () { @@ -1645,9 +1654,11 @@ listen_for_job () { if [ ! "$PERCENT" == "100" ] then echo + stop-ppss log DSPLY "Finished. Consult $JOB_LOG_DIR for job output." log DSPLY "Press ENTER to continue." else + stop-ppss log DSPLY "Finished. Consult $JOB_LOG_DIR for job output." fi cleanup diff --git a/ppss-test.sh b/ppss-test.sh index 601f12d..db2dfdd 100755 --- a/ppss-test.sh +++ b/ppss-test.sh @@ -1,7 +1,7 @@ #!/bin/bash DEBUG="$1" -VERSION="2.56b2" +VERSION="2.56b3" TMP_DIR="ppss" PPSS=./ppss PPSS_DIR=ppss_dir