Last minute fixes - still doesn't work

diff --git a/build/run-casestudy b/build/run-casestudy
index cc3dc680e5c0b66a39aacb10ebc4aea0dbc366ca..41a535cd5a0e16485ab31628b4bfb266e29b18d2 100755 (executable)
--- a/build/run-casestudy
+++ b/build/run-casestudy
@@ -8,7 +8,7 @@ for i in `seq 0 2`; do
     echo "######### Running $i pipelines #########"
     ssh glab "cd frescor/demo/$BUILD; sudo ./setup $i"
     # Run video streamer
-    ssh glab "cd frescor/demo/$BUILD; sleep 5; logapp --logtime=true --logfile=client-stramer.log ./_compiled/bin/recorder -r 30 -s 160x120 -contract_label client_streamer -i stream.mp4 -f rtp -vcodec mpeg4 'rtp://192.168.1.104:20000?budget=12000&period=1000&deadline=33'" &
+    ssh glab "cd frescor/demo/$BUILD; sleep 7; logapp --logtime=true --logfile=client-stramer.log ./_compiled/bin/recorder -r 30 -s 160x120 -vframes 200 -contract_label client_streamer -i stream.mp4 -f rtp -vcodec mpeg4 'rtp://192.168.1.104:20000?budget=12000&period=1000&deadline=33' -renegotiate 100" >/dev/null 2>&1 &
     #ssh wsheee.local "cd frescor/demo/$BUILD; sleep 5; ./_compiled/bin/recorder -r 30 -f video4linux2 -s 640x480 -i /dev/video0 -f rtp -vcodec mpeg4 'rtp://wsheee.local:20000?budget=125000&period=1000&deadline=33'" &
     for j in `seq 0 $i`; do
        ./run-pipeline.sh $j $i < /dev/null &

diff --git a/build/run-pipeline.sh b/build/run-pipeline.sh
index b7d0af31730761be7356ca661687e73e7cf8836f..c468109bfe168ff8de383d7d24b3b0be186b2cec 100755 (executable)
--- a/build/run-pipeline.sh
+++ b/build/run-pipeline.sh
@@ -18,16 +18,16 @@ BUILD=`basename $PWD`
 
 trap '$WRAPPER kill $STREAMER_PID' EXIT
 
-logapp --dumbterm=true --logtime=true --logfile=streamer.$TOTAL-$NUM.log \
+logapp --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 &
+> /dev/null 2>&1 &
 STREAMER_PID=$!
 
 sleep 0.5
 
 scp sdp$NUM.txt glab:frescor/demo/$BUILD
 
-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 \
+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" 2>&1 \
 | perl -ne '$result=$_ if m/interframe interval/;
                    END { open FILE, ">", "result-rec-$ENV{q{NUM}}"; print FILE "$result\n"; }'

diff --git a/src/fwp b/src/fwp
index da7d8d49850eae2f11d98925f4439da16c04f943..833ecb742f57d7e3425c9d3760c943c973f6a954 160000 (submodule)
--- a/src/fwp
+++ b/src/fwp
@@ -1 +1 @@
-Subproject commit da7d8d49850eae2f11d98925f4439da16c04f943
+Subproject commit 833ecb742f57d7e3425c9d3760c943c973f6a954

diff --git a/src/recorder/ffmpeg.c b/src/recorder/ffmpeg.c
index faae17c3294a43289c00cf3490a63d6860d078b7..016ba6500ad93424d923579545098cd86f182667 100644 (file)
--- a/src/recorder/ffmpeg.c
+++ b/src/recorder/ffmpeg.c
@@ -1591,6 +1591,7 @@ timespec_subtract (struct timespec *result,
 
 #ifdef CONFIG_FFMPEG_WITH_FRSH
 frsh_vres_id_t disk_vres;
+frsh_contract_t cpu_contract;
 frsh_contract_t disk_contract;
 #endif
 
@@ -1615,8 +1616,10 @@ print_timing(void)
               f, 1/ifi, 1/ifi_avg, 1/sqrt(ifi_var));
 
 #ifdef CONFIG_FFMPEG_WITH_FRSH
-       if (renegotiate == f)
+       if (renegotiate == f) {
                frsh_contract_renegotiate_sync(&disk_contract, disk_vres);
+               frsh_contract_renegotiate_sync(&disk_contract, disk_vres);
+       }
 #endif
 out:
        start = end;
@@ -4045,7 +4048,6 @@ int frsh_stuff()
     frsh_thread_attr_t frsh_attr;
     frsh_thread_id_t thread;
     frsh_vres_id_t cpu_vres;
-    frsh_contract_t cpu_contract;
     frsh_rel_time_t cpu_budget, cpu_period;
 
     frsh_rel_time_t disk_budget, disk_period;