Log case study applications to files

diff --git a/build/run-casestudy b/build/run-casestudy
index 6064638418d8d4a34c904efc851c48aa806548d2..3aeaffec515911164384a8a4315b28301ed7cb1d 100755 (executable)
--- a/build/run-casestudy
+++ b/build/run-casestudy
@@ -6,9 +6,9 @@ BUILD=`basename $PWD`
 
 for i in `seq 0 2`; do
     echo "######### Running $i pipelines #########"
-    ssh glab "cd frescor/demo/$BUILD; sudo ./setup"
+    ssh glab "cd frescor/demo/$BUILD; sudo ./setup $i"
     for j in `seq 0 $i`; do
-       ./run-pipeline.sh $j < /dev/null &
+       ./run-pipeline.sh $j $i < /dev/null &
     done
     wait
     echo "Pipelines finished"

diff --git a/build/run-pipeline.sh b/build/run-pipeline.sh
index dc4ec7b5939cbc4bf58b09b0a2e73a5ef7bafa76..b7d0af31730761be7356ca661687e73e7cf8836f 100755 (executable)
--- a/build/run-pipeline.sh
+++ b/build/run-pipeline.sh
@@ -5,6 +5,7 @@ die() { set +x; echo $1; exit 1; }
 set -e
 set -x
 NUM=$1
+TOTAL=$2
 export NUM
 
 [ -z "$NUM" ] && die 'No number specified as $1'
@@ -17,8 +18,9 @@ BUILD=`basename $PWD`
 
 trap '$WRAPPER kill $STREAMER_PID' EXIT
 
-$WRAPPER ./_compiled/bin/streamer -d /dev/video$NUM -s sdp$NUM.txt \
-                        -m 192.168.1.10 -p $((20000+2*$NUM)) \
+logapp --dumbterm=true --logtime=true --logfile=streamer.$TOTAL-$NUM.log \
+    $WRAPPER ./_compiled/bin/streamer -d /dev/video$NUM -s sdp$NUM.txt \
+        -m 192.168.1.10 -p $((20000+2*$NUM)) \
 > /dev/null &
 STREAMER_PID=$!
 
@@ -26,6 +28,6 @@ sleep 0.5
 
 scp sdp$NUM.txt glab:frescor/demo/$BUILD
 
-ssh -t glab "cd frescor/demo/$BUILD; sudo ./_compiled/bin/recorder -direct -i sdp$NUM.txt -y -vframes 500 stream$NUM.mp4 #-renegotiate $((NUM*100))" 2>&1 \
+ssh -t glab "cd frescor/demo/$BUILD; logapp --logtime=true --logfile=recorder.$TOTAL-$NUM.log sudo ./_compiled/bin/recorder -direct -i sdp$NUM.txt -y -vframes 500 stream$NUM.mp4 #-renegotiate $((NUM*100))" 2>&1 \
 | perl -ne '$result=$_ if m/interframe interval/;
                    END { open FILE, ">", "result-rec-$ENV{q{NUM}}"; print FILE "$result\n"; }'