Merge branch 'master' of ssh://cvs.cs.unc.edu/~/litmus/papers/litmus3/csvtools

4 files changed, 17 insertions, 7 deletions

diff --git a/crunch_all b/crunch_all
index cd8ae43..8623af6 100755
--- a/crunch_all
+++ b/crunch_all
@@ -3,12 +3,19 @@
 PLUGINS="GSN-EDF PSN-EDF C-EDF PFAIR"
 SIZES="050 100 150 200 250 300 350 400 450"
 EVENTS="SCHED SCHED2 TICK CXS RELEASE"
+#EVENTS="SCHED2"
 
+CRUNCH_EVENT=crunch_event
+
+for P in $PLUGINS; do
+    mkdir -p $P
+    mv *${P}*.csv $P
+done
 
 for E in $EVENTS; do
     for P in $PLUGINS; do
         cd $P
-        ~/l3/csvtools/crunch_event $E > $E.csv &
+        ${CRUNCH_EVENT} $E > $E.csv &
         cd ..
     done
 done
diff --git a/crunch_event b/crunch_event
index fe3698a..5990ea8 100755
--- a/crunch_event
+++ b/crunch_event
@@ -1,11 +1,12 @@
 #!/bin/bash
 
 SIZES="050 100 150 200 250 300 350 400 450"
+#SIZES="001 005 010 025"
 
 EVENT=$1
 
+ANALYZE=analyze
 
-
-for S in $SIZES; do    
-    ~/l3/csvtools/analyze -p1200 -s --csv --label $S  *.$EVENT.$S.csv
+for S in $SIZES; do
+    $ANALYZE -p1200 -s --csv --label $S -i  *.$EVENT.$S.csv
 done
diff --git a/merge b/merge
index 7fe7c9c..ae19d26 100755
--- a/merge
+++ b/merge
@@ -2,14 +2,15 @@
 
 PLUGINS="GSN-EDF PSN-EDF C-EDF PFAIR"
 SIZES="050 100 150 200 250 300 350 400 450"
+#SIZES="001 005 010 025"
 EVENTS="SCHED SCHED2 TICK CXS RELEASE"
-
+#EVENTS="SCHED2"
 
 for E in $EVENTS; do
     for S in $SIZES; do
         for P in $PLUGINS; do
-            echo "cat uni1_$S_{0,1,2,3,4,5,6,8,9}.ts.$P.$E.csv > $P.$E.$S.csv "
-            cat uni1_${S}_{0,1,2,3,4,5,6,8,9}.ts.$P.$E.csv > $P.$E.$S.csv 
+            echo "cat uni1_$S_{0,1,2,3,4,5,6,8,9}.ts.$P.$E.csv > $1$P.$E.$S.csv "
+            cat uni1_${S}_{0,1,2,3,4,5,6,8,9}.ts.$P.$E.csv > $1$P.$E.$S.csv 
         done
     done
 done
diff --git a/split b/split
index dc865d5..d745fd1 100755
--- a/split
+++ b/split
@@ -3,6 +3,7 @@
 SPLITTER=ft2csv
 
 EVENTS="SCHED SCHED2 TICK CXS RELEASE"
+#EVENTS=SCHED2
 
 function do_split() {
         printf "\nsplitting $1\n"