[Swift-commit] r3490 - in trunk: bin libexec/log-processing

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-07-28 17:44:31 -0500 (Wed, 28 Jul 2010)
New Revision: 3490

Added:
   trunk/libexec/log-processing/simple-start-time.sh
Modified:
   trunk/bin/swift-plot-log
   trunk/libexec/log-processing/extract-start-time
   trunk/libexec/log-processing/makefile
   trunk/libexec/log-processing/weights.sh
Log:
Fixes for weights.png


Modified: trunk/bin/swift-plot-log
===================================================================
--- trunk/bin/swift-plot-log	2010-07-28 19:44:36 UTC (rev 3489)
+++ trunk/bin/swift-plot-log	2010-07-28 22:44:31 UTC (rev 3490)
@@ -1,11 +1,12 @@
 #!/bin/bash
 
+# $1 should be the pathname of the log file to plot
+# The rest of the line is passed to make 
+#    They must be figures
+
 ORIGDIR=$(pwd)
 WORKINGDIR=$(mktemp -d /tmp/swift-plot-log-XXXXXXXXXXXXXXXX)
 
-
-# $1 should be the pathname of the log file to plot
-
 LOG_CODE_HOME="`dirname $0`/../libexec/log-processing/"
 export SWIFT_PLOT_HOME=$LOG_CODE_HOME
 
@@ -41,13 +42,13 @@
 fi
 
 if [ "X$2" = "X" ]; then
-make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights webpage.coasters karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event karatasks.JOB_SUBMISSION.eip  $MAKETARGETS webpage distribute
+make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH webpage.kara webpage.weights webpage.coasters karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event karatasks.JOB_SUBMISSION.eip  $MAKETARGETS webpage distribute
 else
 shift
-make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean $@
+make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH $@
 cp $@ $ORIGDIR/
 fi
 
 # mv report-$LOG_FILE_BASE $LOG_DIRECTORY/
 
-rm -r $WORKINGDIR
+# rm -r $WORKINGDIR

Modified: trunk/libexec/log-processing/extract-start-time
===================================================================
--- trunk/libexec/log-processing/extract-start-time	2010-07-28 19:44:36 UTC (rev 3489)
+++ trunk/libexec/log-processing/extract-start-time	2010-07-28 22:44:31 UTC (rev 3490)
@@ -1,3 +1,9 @@
+#!/bin/sh
+
+set -x 
+
+/bin/pwd 1>&2 
+
 rm -f tmp-extract-starttime2
 
 if [ "X$LOG" != "X" ] ; then

Modified: trunk/libexec/log-processing/makefile
===================================================================
--- trunk/libexec/log-processing/makefile	2010-07-28 19:44:36 UTC (rev 3489)
+++ trunk/libexec/log-processing/makefile	2010-07-28 22:44:31 UTC (rev 3490)
@@ -112,9 +112,12 @@
 execstages.png: execute2.event dostagein.event dostageout.event start-time.tmp workflow.event 
 	execstages-plot
 
+simple-start-time.tmp: $(LOG) 
+	simple-start-time.sh $(LOG) $(@)
+
 # weight processing
-weights.png: $(LOG)
-	weights.sh $(LOG)
+weights.png: simple-start-time.tmp $(LOG)
+	weights.sh $(LOG) $(shell cat simple-start-time.tmp ) 
 
 info.transitions:
 	info-to-transitions $(IDIR) > $@

Added: trunk/libexec/log-processing/simple-start-time.sh
===================================================================
--- trunk/libexec/log-processing/simple-start-time.sh	                        (rev 0)
+++ trunk/libexec/log-processing/simple-start-time.sh	2010-07-28 22:44:31 UTC (rev 3490)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+LOG=$1
+OUTPUT=$2
+
+iso-to-secs < ${LOG} | grep RUNID | awk '{ print $1 }' > ${OUTPUT}


Property changes on: trunk/libexec/log-processing/simple-start-time.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/libexec/log-processing/weights.sh
===================================================================
--- trunk/libexec/log-processing/weights.sh	2010-07-28 19:44:36 UTC (rev 3489)
+++ trunk/libexec/log-processing/weights.sh	2010-07-28 22:44:31 UTC (rev 3490)
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-grep 'WeightedHostScoreScheduler CONTACT_SELECTED' $1 | iso-to-secs | normalise-event-start-time | sed 's/^\([^ ]*\) .* score=\(.*\)$/\1 \2/' |  sed 's/,//g' > weights.tmp
+LOG=$1
+TIME=$2
 
+grep 'WeightedHostScoreScheduler CONTACT_SELECTED' $1 | iso-to-secs | normalise-event-start-time-to-any ${TIME} | sed 's/^\([^ ]*\) .* score=\(.*\)$/\1 \2/' |  sed 's/,//g' > weights.tmp
+
 if [ -s weights.tmp ]; then
 	gnuplot ${SWIFT_PLOT_HOME}/weights.plot
 fi
-