Merge branch 'master' of rtime.felk.cvut.cz:/var/git/frescor/demo

diff --git a/build/run-casestudy b/build/run-casestudy
index 7ba349add5006dcac712dceee1c3b665fca00a2d..f392993ef68fee6059ae9094a8d987dbe1cecc1d 100755 (executable)
--- a/build/run-casestudy
+++ b/build/run-casestudy
@@ -12,7 +12,7 @@ for i in `seq 0 2`; do
     echo "Pipelines finished"
     rm -f result-agregate-$i
     for j in `seq 0 $i`; do
-       cat result-rec-$j >> result-agregate-$i
+       cat result-rec-$j | sed -e '/interframe interval/!d' >> result-agregate-$i
     done
     sleep 1
 done

diff --git a/build/run-pipeline.sh b/build/run-pipeline.sh
index effa7f93c68bd367087d6192a1ac8af4f517da0e..d0de4124b93a2df7cb288041fc430c4a2e66ed1c 100755 (executable)
--- a/build/run-pipeline.sh
+++ b/build/run-pipeline.sh
@@ -5,12 +5,12 @@ set -x
 NUM=$1
 export NUM
 
-trap 'kill $STREAMER_PID' EXIT
-
 BUILD=`basename $PWD`
-[ "$BUILD" = "build" ] && WRAPPER="sudo chrt -f 50"
+#[ "$BUILD" = "build" ] && WRAPPER="sudo chrt -f 50"
+
+trap '$WRAPPER kill $STREAMER_PID' EXIT
 
-$WRAPER ./_compiled/bin/streamer -d /dev/video$NUM -s sdp$NUM.txt \
+$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=$!

diff --git a/results/casestudy.gp b/results/casestudy.gp
index 493abd934c3dc2f976eaf6035c0bf2730bdad601..40ee2b03acd430d889aaf8ee0db60e5fb7776699 100644 (file)
--- a/results/casestudy.gp
+++ b/results/casestudy.gp
@@ -29,9 +29,9 @@ plot \
      'frsh-hackbench-ping.dat'           using ($1+0.8):2:(0.3) with boxes fs solid 0.5 title "With FRSH", \
      'no-frsh-ping-hackbench.dat' using ($1+1.2):2:(0.3) with boxes fs pattern 1 title "Without FRSH"
 
-set yrange [0:*]
+set yrange [0:0.03]
 set xlabel "Number of video streams"
-set ylabel "Standard deviation of\nframe processing time [s]"
+set ylabel "Standard deviation of\ninter-frame time [s]"
 set title "e) No load"
 plot \
      'frsh.dat'                  using ($1+0.8):3:(0.3) with boxes fs solid 0.5 title "With FRSH", \
@@ -42,6 +42,7 @@ set title "f) Wi-Fi loaded"
 plot \
      'frsh-ping.dat'             using ($1+0.8):3:(0.3) with boxes fs solid 0.5 title "With FRSH" , \
      'no-frsh-ping.dat'          using ($1+1.2):3:(0.3) with boxes fs pattern 1 title "Without FRSH"
+set yrange [0:0.3]
 set title "g) CPU loaded"
 plot \
      'frsh-hackbench.dat'        using ($1+0.8):3:(0.3) with boxes fs solid 0.5 title "With FRSH", \

diff --git a/results/frsh-ping/result-agregate-0 b/results/frsh-ping/result-agregate-0
index 830c53e7df7ced3a1b3ad8271a2890224fe76bcb..e1d7ff4c4a39d20e31638932b95abc4e42bf9416 100644 (file)
--- a/results/frsh-ping/result-agregate-0
+++ b/results/frsh-ping/result-agregate-0
@@ -1,2 +1 @@
-  551: interframe interval = 1/33.31 s  avg=1/31.25  stddev=1/157.01
-
+  551: interframe interval = 1/31.40 s  avg=1/30.81  stddev=1/160.99

diff --git a/results/frsh-ping/result-agregate-1 b/results/frsh-ping/result-agregate-1
index f6f1abee4681b43fa3d5d284ba6365610ae11504..82f378764c6e0c799e4484336a5762249989d15c 100644 (file)
--- a/results/frsh-ping/result-agregate-1
+++ b/results/frsh-ping/result-agregate-1
@@ -1,4 +1,2 @@
-  535: interframe interval = 1/30.27 s  avg=1/31.12  stddev=1/108.18
-
-  548: interframe interval = 1/26.87 s  avg=1/31.10  stddev=1/122.67
-
+  539: interframe interval = 1/50.37 s  avg=1/31.07  stddev=1/137.11
+  551: interframe interval = 1/34.71 s  avg=1/31.20  stddev=1/139.86

diff --git a/results/frsh-ping/result-agregate-2 b/results/frsh-ping/result-agregate-2
index 89440e440b0eb7b8e122624f456900a1f334c158..c28e1eb747f666fc10ec31bfeb7ef4a00259e8eb 100644 (file)
--- a/results/frsh-ping/result-agregate-2
+++ b/results/frsh-ping/result-agregate-2
@@ -1,6 +1,3 @@
-  539: interframe interval = 1/29.16 s  avg=1/31.22  stddev=1/93.46
-
-  539: interframe interval = 1/32.11 s  avg=1/31.07  stddev=1/100.17
-
-  539: interframe interval = 1/26.17 s  avg=1/31.20  stddev=1/92.13
-
+  537: interframe interval = 1/31.73 s  avg=1/30.91  stddev=1/91.05
+  537: interframe interval = 1/30.50 s  avg=1/31.08  stddev=1/90.85
+  549: interframe interval = 1/22.00 s  avg=1/30.93  stddev=1/93.53

diff --git a/results/frsh/result-agregate-0 b/results/frsh/result-agregate-0
index db7d589aa4fe1dd63e48b23f5802f804ba28ebf7..f2dfad4ce4235101ef3515c3714ebf463a50b806 100644 (file)
--- a/results/frsh/result-agregate-0
+++ b/results/frsh/result-agregate-0
@@ -1 +1 @@
-  539: interframe interval = 1/34.37 s  avg=1/31.16  stddev=1/183.32
+  551: interframe interval = 1/32.50 s  avg=1/31.24  stddev=1/190.72

diff --git a/results/frsh/result-agregate-1 b/results/frsh/result-agregate-1
index d26e68f96272abbb3c84a4142dc2d25fc9cfedbf..3c7186f1561b774b4b5e3141e78a7fdd3c3213f1 100644 (file)
--- a/results/frsh/result-agregate-1
+++ b/results/frsh/result-agregate-1
@@ -1,2 +1,2 @@
-  539: interframe interval = 1/30.84 s  avg=1/31.03  stddev=1/148.55
-  539: interframe interval = 1/32.29 s  avg=1/30.98  stddev=1/128.07
+  551: interframe interval = 1/28.50 s  avg=1/31.33  stddev=1/129.94
+  551: interframe interval = 1/31.94 s  avg=1/31.28  stddev=1/122.21

diff --git a/results/frsh/result-agregate-2 b/results/frsh/result-agregate-2
index de2e41e39766cec7bc63d7cdefb6d978af546777..a6fa083d2cd690b259c64a5cfbfdaf99b19c9dfd 100644 (file)
--- a/results/frsh/result-agregate-2
+++ b/results/frsh/result-agregate-2
@@ -1,3 +1,3 @@
-  539: interframe interval = 1/61.49 s  avg=1/30.88  stddev=1/108.01
-  539: interframe interval = 1/29.86 s  avg=1/30.96  stddev=1/101.82
-  539: interframe interval = 1/30.97 s  avg=1/31.08  stddev=1/118.47
+  539: interframe interval = 1/31.37 s  avg=1/31.32  stddev=1/101.09
+  539: interframe interval = 1/31.55 s  avg=1/31.26  stddev=1/108.53
+  539: interframe interval = 1/31.77 s  avg=1/31.16  stddev=1/88.27

diff --git a/results/no-frsh-ping/result-agregate-0 b/results/no-frsh-ping/result-agregate-0
index 98bd67fd8da1c7eaf1c96c4d06cc01450ff75664..07d7cea190233d7b84848e6a9a62941b3794fd66 100644 (file)
--- a/results/no-frsh-ping/result-agregate-0
+++ b/results/no-frsh-ping/result-agregate-0
@@ -1 +1 @@
-  549: interframe interval = 1/29.97 s  avg=1/31.09  stddev=1/44.10
+  551: interframe interval = 1/31.92 s  avg=1/31.27  stddev=1/148.44

diff --git a/results/no-frsh-ping/result-agregate-1 b/results/no-frsh-ping/result-agregate-1
index 3dda725f4f1a509891375485b1ee6dc14439884c..f27173904c08659bbb5110559e77d926ed0ffa14 100644 (file)
--- a/results/no-frsh-ping/result-agregate-1
+++ b/results/no-frsh-ping/result-agregate-1
@@ -1,2 +1,2 @@
-  539: interframe interval = 1/24.20 s  avg=1/31.18  stddev=1/105.76
-  539: interframe interval = 1/29.73 s  avg=1/31.18  stddev=1/90.02
+  551: interframe interval = 1/32.07 s  avg=1/31.11  stddev=1/108.58
+  539: interframe interval = 1/31.79 s  avg=1/31.07  stddev=1/101.05

diff --git a/results/no-frsh-ping/result-agregate-2 b/results/no-frsh-ping/result-agregate-2
index 86f25319f1ab784ad2e32334bd063b66721c657d..c18f9aa5a2a3bb3bf50a23bbea931b4104c9a83d 100644 (file)
--- a/results/no-frsh-ping/result-agregate-2
+++ b/results/no-frsh-ping/result-agregate-2
@@ -1,3 +1,3 @@
-  537: interframe interval = 1/28.29 s  avg=1/30.75  stddev=1/98.30
-  538: interframe interval = 1/51.99 s  avg=1/31.20  stddev=1/110.84
-  538: interframe interval = 1/35.93 s  avg=1/31.16  stddev=1/123.13
+  538: interframe interval = 1/29.91 s  avg=1/30.89  stddev=1/41.94
+  538: interframe interval = 1/24.57 s  avg=1/30.96  stddev=1/42.90
+  539: interframe interval = 1/26.29 s  avg=1/31.03  stddev=1/43.80

diff --git a/results/no-frsh/result-agregate-0 b/results/no-frsh/result-agregate-0
index a704262e991e896ba912c18ebc53b19b14edd910..68642137a5356bc0f35f68139d6f1d1d6a87dddb 100644 (file)
--- a/results/no-frsh/result-agregate-0
+++ b/results/no-frsh/result-agregate-0
@@ -1 +1 @@
-  551: interframe interval = 1/30.57 s  avg=1/31.24  stddev=1/146.04
+  527: interframe interval = 1/28.50 s  avg=1/31.42  stddev=1/145.38

diff --git a/results/no-frsh/result-agregate-1 b/results/no-frsh/result-agregate-1
index 5720c7026a0300eac78b7e8e76dcf48358f3f125..7160d0a36c5cc332b46e1c877c24fbad59ffa458 100644 (file)
--- a/results/no-frsh/result-agregate-1
+++ b/results/no-frsh/result-agregate-1
@@ -1,2 +1,2 @@
-  551: interframe interval = 1/31.07 s  avg=1/31.05  stddev=1/132.25
-  539: interframe interval = 1/31.27 s  avg=1/31.06  stddev=1/116.20
+  551: interframe interval = 1/223.56 s  avg=1/31.04  stddev=1/99.24
+  539: interframe interval = 1/68.76 s  avg=1/31.33  stddev=1/88.59

diff --git a/results/no-frsh/result-agregate-2 b/results/no-frsh/result-agregate-2
index 9b2d33a91686abb14107db9db9ab14ad9a7c95da..67e4850193a7d92f671b42855985fd6ff1fa9835 100644 (file)
--- a/results/no-frsh/result-agregate-2
+++ b/results/no-frsh/result-agregate-2
@@ -1,3 +1,3 @@
-  539: interframe interval = 1/19.37 s  avg=1/31.04  stddev=1/45.38
-  539: interframe interval = 1/31.55 s  avg=1/31.14  stddev=1/45.01
-  539: interframe interval = 1/32.67 s  avg=1/31.26  stddev=1/46.54
+  539: interframe interval = 1/20.25 s  avg=1/31.23  stddev=1/62.82
+  539: interframe interval = 1/20.20 s  avg=1/31.23  stddev=1/72.78
+  539: interframe interval = 1/29.98 s  avg=1/31.33  stddev=1/67.89