[Swift-commit] r5711 - provenancedb

[lgadelha at ci.uchicago.edu]

Author: lgadelha
Date: 2012-03-12 22:49:46 -0500 (Mon, 12 Mar 2012)
New Revision: 5711

Modified:
   provenancedb/info-to-runtime
   provenancedb/prov-to-sql.sh
Log:


Modified: provenancedb/info-to-runtime
===================================================================
--- provenancedb/info-to-runtime	2012-03-13 03:23:19 UTC (rev 5710)
+++ provenancedb/info-to-runtime	2012-03-13 03:49:46 UTC (rev 5711)
@@ -10,7 +10,7 @@
     
     if [ "X$record" != "X" ] && [ -f $record ] ; then
 	
-	grep '^RUNTIME_INFO=' $record | sed "s/^RUNTIME_INFO=\(.*\)$/$globalid \1/"
+	grep '^RUNTIME_AGGR=' $record | sed "s/^RUNTIME_AGGR=\(.*\)$/$globalid \1/"
 	
     else
 	echo no wrapper log for $id >&2

Modified: provenancedb/prov-to-sql.sh
===================================================================
--- provenancedb/prov-to-sql.sh	2012-03-13 03:23:19 UTC (rev 5710)
+++ provenancedb/prov-to-sql.sh	2012-03-13 03:49:46 UTC (rev 5711)
@@ -148,7 +148,7 @@
 	walltime=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
 	systime=$(echo $runtime | awk -F "," '{print $3}' | awk -F ":" '{print $2}')
 	usertime=$(echo $runtime | awk -F "," '{print $4}' | awk -F ":" '{print $2}')
-	cpu=$(echo $runtime | awk -F "," '{print $5}' | awk -F ":" '{print $2}')
+	cpu=$(echo $runtime | awk -F "," '{print $5}' | awk -F ":" '{print $2}' | awk -F "%" '{print $1}')
 	fsin=$(echo $runtime | awk -F "," '{print $6}' | awk -F ":" '{print $2}')
 	fsout=$(echo $runtime | awk -F "," '{print $7}' | awk -F ":" '{print $2}')
 	timesswapped=$(echo $runtime | awk -F "," '{print $8}' | awk -F ":" '{print $2}')