Update of manager and scheduler to the changes in frsh_forb

[frescor/fwp.git] / fwp / fwp-demo1

diff --git a/fwp/fwp-demo1 b/fwp/fwp-demo1
index e3cc428fb585490411f204d33cacba4bcba56693..32a40bbe7f9a4788777958d73578c189307df142 100755 (executable)
--- a/fwp/fwp-demo1
+++ b/fwp/fwp-demo1
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-KONSOLE="konsole --profile bigfont"
-#TARGET=192.168.1.100
-TARGET=localhost
+KONSOLE=${KONSOLE:-"konsole --profile bigfont"}
+TARGET=${TARGET:-192.168.1.100}
+#TARGET=localhost
 
 sudo iwconfig wlan0 rate 1M
 
@@ -15,18 +15,21 @@ sleep 1
 echo "Press a key..."
 read
 
-$KONSOLE --geometry +0+500 --vt_sz 80x2 -e bash -c "sudo fwptester $TARGET; sleep 10"&
+$KONSOLE --geometry +0+430 --vt_sz 80x2 -e bash -c "sudo fwptester $TARGET; sleep 10"&
 BG0=$!
 
 echo "Press a key..."
 read
 
-$KONSOLE --geometry +0+700 --vt_sz 80x2 -e bash -c "sudo fwptester -B 1000 $TARGET; sleep 10"
+$KONSOLE --geometry +0+550 --vt_sz 80x2 -e bash -c "sudo fwptester -B 1000 $TARGET; sleep 10" &
+
+echo "Press a key..."
+read
 
 (
+    RANDOM=5
     while true; do
-       echo example 1
-        $KONSOLE --geometry +0+700 --vt_sz 80x2 -e bash -c "sudo fwptester -c 30 -B $((RANDOM%200)) -s $((RANDOM%1300+40)) $TARGET; sleep 10"
+        $KONSOLE --geometry +0+550 --vt_sz 80x3 -e bash -c "sudo fwptester -c 30 -B $((RANDOM%200)) -s $((RANDOM%1300+40)) $TARGET; echo Finished; sleep 10"
        sleep 10
     done
 
@@ -35,9 +38,9 @@ $KONSOLE --geometry +0+700 --vt_sz 80x2 -e bash -c "sudo fwptester -B 1000 $TARG
 BG1=$!
 
 (
+    RANDOM=3
     while true; do
-       echo example 2
-        $KONSOLE --geometry +0+900 --vt_sz 80x2 -e bash -c "sudo fwptester -c 20 -b VO:$((RANDOM%100)),VO:$((RANDOM%100)) -s $((RANDOM%1300+40)) $TARGET; sleep 10"
+        $KONSOLE --geometry +0+700 --vt_sz 80x3 -e bash -c "sudo fwptester -c 20 -b VO:$((RANDOM%100)),VO:$((RANDOM%100)) -s $((RANDOM%1300+40)) $TARGET; echo Finished; sleep 10"
        sleep 10
     done