[Swift-commit] r2967 - in trunk: . libexec/log-processing tests/language-behaviour

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-06-22 06:14:00 -0500 (Mon, 22 Jun 2009)
New Revision: 2967

Added:
   trunk/libexec/log-processing/log-to-internal-proc-transitions
Modified:
   trunk/build.xml
   trunk/libexec/log-processing/makefile
   trunk/tests/language-behaviour/run
Log:
Log processing for internal procedure provenance logs

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2009-06-22 09:02:33 UTC (rev 2966)
+++ trunk/build.xml	2009-06-22 11:14:00 UTC (rev 2967)
@@ -154,6 +154,7 @@
 		<chmod perm="+x" file="${dist.dir}/libexec/log-processing/log-to-initshareddir-transitions"/>
 		<chmod perm="+x" file="${dist.dir}/libexec/log-processing/log-to-karatasks-transitions"/>
 		<chmod perm="+x" file="${dist.dir}/libexec/log-processing/log-to-compound-transitions"/>
+		<chmod perm="+x" file="${dist.dir}/libexec/log-processing/log-to-internal-proc-transitions"/>
 		<chmod perm="+x" file="${dist.dir}/libexec/log-processing/logs-for-all"/>
 		<chmod perm="+x" file="${dist.dir}/libexec/log-processing/lookup-colour"/>
 		<chmod perm="+x" file="${dist.dir}/libexec/log-processing/max-duration"/>

Added: trunk/libexec/log-processing/log-to-internal-proc-transitions
===================================================================
--- trunk/libexec/log-processing/log-to-internal-proc-transitions	                        (rev 0)
+++ trunk/libexec/log-processing/log-to-internal-proc-transitions	2009-06-22 11:14:00 UTC (rev 2967)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# this will take a log file and produce a set of state transition
+# events for every internal procedure
+
+# 2009-05-04 18:02:15,499+0200 INFO  vdl:mains INTERNALPROC_START thread=0-1 name=trace
+
+# 2009-05-04 18:02:15,556+0200 INFO  vdl:mains INTERNALPROC_END thread=0-0
+
+
+grep ' INTERNALPROC_START ' $1 | iso-to-secs | \
+sed 's/^\(.*\) INFO  [^ ]* INTERNALPROC_START thread=\([0-9\-]*\) name=\([^ ]*\).*$/\1 \2 START \3/' 
+
+grep ' INTERNALPROC_END ' $1 | iso-to-secs | \
+sed 's/^\(.*\) INFO  [^ ]* INTERNALPROC_END thread=\([0-9\-]*\).*$/\1 \2 END/' 
+
+

Modified: trunk/libexec/log-processing/makefile
===================================================================
--- trunk/libexec/log-processing/makefile	2009-06-22 09:02:33 UTC (rev 2966)
+++ trunk/libexec/log-processing/makefile	2009-06-22 11:14:00 UTC (rev 2967)
@@ -100,6 +100,9 @@
 compound.transitions: $(LOG)
 	log-to-compound-transitions $(LOG) > compound.transitions
 
+internalproc.transitions: $(LOG)
+	log-to-internal-proc-transitions $(LOG) > internalproc.transitions
+
 ## retry analysis
 
 jobs.retrycount.summary: execute2.event

Modified: trunk/tests/language-behaviour/run
===================================================================
--- trunk/tests/language-behaviour/run	2009-06-22 09:02:33 UTC (rev 2966)
+++ trunk/tests/language-behaviour/run	2009-06-22 11:14:00 UTC (rev 2967)
@@ -90,9 +90,9 @@
   fi
 
   # check that all execute and execute2 IDs are unique
-  swift-plot-log ${t}-*.log execute.transitions compound.transitions
-  if [ "$( cat compound.transitions execute.transitions | grep ' START ' | cut -d ' ' -f 2 | sort | uniq -d)" != "" ]; then
-    echo EXECUTE AND COMPOUND IDS NOT UNIQUE
+  swift-plot-log ${t}-*.log execute.transitions compound.transitions internalproc.transitions
+  if [ "$( cat compound.transitions execute.transitions internalproc.transitions | grep ' START ' | cut -d ' ' -f 2 | sort | uniq -d)" != "" ]; then
+    echo EXECUTE AND COMPOUND AND INTERNALPROC IDS NOT UNIQUE
     exit 3
   fi