[Swift-commit] r2556 - log-processing/bin

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-02-17 08:20:30 -0600 (Tue, 17 Feb 2009)
New Revision: 2556

Added:
   log-processing/bin/swift-log-to-cedps
Removed:
   log-processing/bin/swift2cedps
Log:
rename CEDPS log formatting command to something more inline with other swift commands

Copied: log-processing/bin/swift-log-to-cedps (from rev 2555, log-processing/bin/swift2cedps)
===================================================================
--- log-processing/bin/swift-log-to-cedps	                        (rev 0)
+++ log-processing/bin/swift-log-to-cedps	2009-02-17 14:20:30 UTC (rev 2556)
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+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/"
+export SWIFT_PLOT_HOME=$LOG_CODE_HOME
+
+export PATH=${LOG_CODE_HOME}:${PATH}
+
+FC="${1:0:1}"
+
+if [ "$FC" = "/" ]; then # absolute path
+  LOG_FILE_PATH=$1
+else
+  LOG_FILE_PATH="`pwd`/$1"
+fi
+
+LOG_DIRECTORY=`dirname $LOG_FILE_PATH`
+
+LOG_FILE_BASE=`basename $LOG_FILE_PATH .log`
+
+echo Log file path is $LOG_FILE_PATH
+echo Log is in directory $LOG_DIRECTORY
+echo Log basename is $LOG_FILE_BASE
+
+cd $WORKINGDIR
+echo Now in directory $(pwd)
+
+MAKEENV="-f ${LOG_CODE_HOME}/makefile -I ${LOG_CODE_HOME}"
+MAKETARGETS=""
+
+INFODIR=${LOG_DIRECTORY}/${LOG_FILE_BASE}.d
+
+if [ -d $INFODIR ]; then
+ MAKEENV="$MAKEENV IDIR=${LOG_DIRECTORY}/${LOG_FILE_BASE}.d/"
+ MAKETARGETS="webpage.info"
+fi
+
+make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean execute.cedps execute2.cedps karatasks.cedps
+
+cp -v *.cedps $ORIGDIR
+
+# webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event karatasks.JOB_SUBMISSION.eip  $MAKETARGETS webpage distribute
+
+# mv report-$LOG_FILE_BASE $LOG_DIRECTORY/
+
+# rm -r $WORKINGDIR
+echo not removing $WORKINGDIR


Property changes on: log-processing/bin/swift-log-to-cedps
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   + 

Deleted: log-processing/bin/swift2cedps
===================================================================
--- log-processing/bin/swift2cedps	2009-02-17 13:16:40 UTC (rev 2555)
+++ log-processing/bin/swift2cedps	2009-02-17 14:20:30 UTC (rev 2556)
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-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/"
-export SWIFT_PLOT_HOME=$LOG_CODE_HOME
-
-export PATH=${LOG_CODE_HOME}:${PATH}
-
-FC="${1:0:1}"
-
-if [ "$FC" = "/" ]; then # absolute path
-  LOG_FILE_PATH=$1
-else
-  LOG_FILE_PATH="`pwd`/$1"
-fi
-
-LOG_DIRECTORY=`dirname $LOG_FILE_PATH`
-
-LOG_FILE_BASE=`basename $LOG_FILE_PATH .log`
-
-echo Log file path is $LOG_FILE_PATH
-echo Log is in directory $LOG_DIRECTORY
-echo Log basename is $LOG_FILE_BASE
-
-cd $WORKINGDIR
-echo Now in directory $(pwd)
-
-MAKEENV="-f ${LOG_CODE_HOME}/makefile -I ${LOG_CODE_HOME}"
-MAKETARGETS=""
-
-INFODIR=${LOG_DIRECTORY}/${LOG_FILE_BASE}.d
-
-if [ -d $INFODIR ]; then
- MAKEENV="$MAKEENV IDIR=${LOG_DIRECTORY}/${LOG_FILE_BASE}.d/"
- MAKETARGETS="webpage.info"
-fi
-
-make $MAKEENV SDL=${ORIGDIR}/report-${LOG_FILE_BASE} LOG=$LOG_FILE_PATH clean execute.cedps execute2.cedps karatasks.cedps
-
-cp -v *.cedps $ORIGDIR
-
-# webpage.kara webpage.weights karatasks.JOB_SUBMISSION.Queue.transitions karatasks.JOB_SUBMISSION.Queue.event karatasks.JOB_SUBMISSION.eip  $MAKETARGETS webpage distribute
-
-# mv report-$LOG_FILE_BASE $LOG_DIRECTORY/
-
-# rm -r $WORKINGDIR
-echo not removing $WORKINGDIR