Quellcode durchsuchen

cleaning up the outputs

user avadapal vor 9 Monaten
Ursprung
Commit
3904ed0949
3 geänderte Dateien mit 23 neuen und 6 gelöschten Zeilen
  1. 18 2
      Docker/repro
  2. 4 3
      Docker/run-experiment
  3. 1 1
      Docker/unset-networking

+ 18 - 2
Docker/repro

@@ -1,28 +1,44 @@
 #!/bin/bash
-
+LOGSUFFIX="wan10"
 logfile="16.out${LOGSUFFIX}"
 ./run-experiment 16 >> $logfile
 
+echo "16";
+
 logfile="18.out${LOGSUFFIX}"
 ./run-experiment 18 >> $logfile
 
+echo "18";
+
 logfile="20.out${LOGSUFFIX}"
 ./run-experiment 20 >> $logfile
 
+echo "20";
+
 logfile="22.out${LOGSUFFIX}"
 ./run-experiment 22 >> $logfile
 
+echo "22";
+
 logfile="24.out${LOGSUFFIX}"
 ./run-experiment 24 >> $logfile
 
+echo "24";
+
 logfile="26.out${LOGSUFFIX}"
 ./run-experiment 26 >> $logfile
 
+echo "26";
+
 logfile="28.out${LOGSUFFIX}"
 ./run-experiment 28 >> $logfile
 
-logfile="20.out${LOGSUFFIX}"
+echo "28";
+
+logfile="30.out${LOGSUFFIX}"
 ./run-experiment 30 >> $logfile
 
+echo "30";
+
 logfile="32.out${LOGSUFFIX}"
 ./run-experiment 32 >> $logfile

+ 4 - 3
Docker/run-experiment

@@ -12,9 +12,10 @@ savefile1=$$.p1.out
 savefile2=$$.p2.out
 
 lognitems="$1"
-docker exec -w /root/ramen ramen_p2 bash -c "stdbuf -o 0 ./target/release/examples/bench_doram -i 2 -s $lognitems -l $p2addr -p 6000 -c 0:$p0addr:8000 --connect-timeout-seconds 10 > $savefile2" &
-docker exec -w /root/ramen ramen_p1 bash -c "stdbuf -o 0 ./target/release/examples/bench_doram -i 1 -s $lognitems -l $p1addr -p 7000 -c 2:$p2addr:6000 --connect-timeout-seconds 10 > $savefile1" &
-docker exec -w /root/ramen ramen_p0 bash -c "stdbuf -o 0 ./target/release/examples/bench_doram -i 0 -s $lognitems -l $p0addr -p 8000 -c 1:$p1addr:7000 --connect-timeout-seconds 10 > $savefile0" &
+naccess="$2"
+docker exec -w /root/ramen ramen_p2 bash -c "stdbuf -o 0 ./target/release/examples/bench_doram -a $naccess -i 2 -s $lognitems -l $p2addr -p 6000 -c 0:$p0addr:8000 --connect-timeout-seconds 30 > $savefile2" &
+docker exec -w /root/ramen ramen_p1 bash -c "stdbuf -o 0 ./target/release/examples/bench_doram -a $naccess -i 1 -s $lognitems -l $p1addr -p 7000 -c 2:$p2addr:6000 --connect-timeout-seconds 30 > $savefile1" &
+docker exec -w /root/ramen ramen_p0 bash -c "stdbuf -o 0 ./target/release/examples/bench_doram -a $naccess -i 0 -s $lognitems -l $p0addr -p 8000 -c 1:$p1addr:7000 --connect-timeout-seconds 30 > $savefile0" &
 wait
 echo ===== P0 output
 docker exec -w /root/ramen ramen_p0 cat $savefile0

+ 1 - 1
Docker/unset-networking

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-for ctnr in duoram_p0 duoram_p1 duoram_p2; do
+for ctnr in ramen_p0 ramen_p1 ramen_p2; do
     docker exec --privileged $ctnr bash -c "if tc qdisc list dev eth0 | grep -q netem; then tc qdisc del dev eth0 root; fi"
 done