[Swift-commit] r2320 - in log-processing: bin libexec

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-11-03 17:13:30 -0600 (Mon, 03 Nov 2008)
New Revision: 2320

Modified:
   log-processing/bin/swift-plot-log
   log-processing/libexec/makefile
Log:
build in a temporary directory; this keeps temp files out of initial pwd of swift-plot-log and allows multiple invocations to be run at once witout conflict

Modified: log-processing/bin/swift-plot-log
===================================================================
--- log-processing/bin/swift-plot-log	2008-11-03 22:50:43 UTC (rev 2319)
+++ log-processing/bin/swift-plot-log	2008-11-03 23:13:30 UTC (rev 2320)
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+ORIGDIR=$(pwd)
+WORKINGDIR=$(mktemp /tmp/swift-plot-log-XXXXXXXXXXXXXXXX)
+
+
 # $1 should be the pathname of the log file to plot
 
 LOG_CODE_HOME="`dirname $0`/../libexec/"
@@ -23,6 +27,8 @@
 echo Log is in directory $LOG_DIRECTORY
 echo Log basename is $LOG_FILE_BASE
 
+cd $WORKINGDIR
+
 MAKEENV="-f ${LOG_CODE_HOME}/makefile -I ${LOG_CODE_HOME}"
 MAKETARGETS=""
 
@@ -33,6 +39,8 @@
  MAKETARGETS="webpage.info"
 fi
 
-make $MAKEENV SDL=$LOG_FILE_BASE LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event  $MAKETARGETS webpage distribute
+make $MAKEENV REPORTDIR=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event  $MAKETARGETS webpage distribute
 
 # mv report-$LOG_FILE_BASE $LOG_DIRECTORY/
+
+rm -r $WORKINGDIR

Modified: log-processing/libexec/makefile
===================================================================
--- log-processing/libexec/makefile	2008-11-03 22:50:43 UTC (rev 2319)
+++ log-processing/libexec/makefile	2008-11-03 23:13:30 UTC (rev 2320)
@@ -12,8 +12,8 @@
 	rm -f *.tmp log *.transitions tmp-*
 
 distribute:
-	mkdir -p report-$(SDL)
-	cp *.event *.html *.png report-$(SDL)
+	mkdir -p $(SDL)
+	cp *.event *.html *.png $(SDL)
 
 clean:
 	rm -f start-times.data kickstart-times.data start-time.tmp end-time.tmp threads.list tasks.list log *.data *.shifted *.png *.event *.coloured-event *.total *.tmp *.transitions *.last karatasks-type-counts.txt index.html *.lastsummary execstages.plot total.plot colour.plot jobs-sites.table jobs.retrycount.summary kickstart.stats execution-counts.txt site-duration.txt jobs.retrycount sp.plot karatasks.coloured-sorted-event *.cedps *.stats t.inf *.seenstates tmp-* clusterstats  trname-summary sites-list.data.nm info-md5sums pse2d-tmp.eip karajan.html falkon.html execute2.html info.html execute.html kickstart.html scheduler.html assorted.html