diff options
| -rwxr-xr-x | tabulate.sh | 2 | ||||
| -rwxr-xr-x | testall.sh | 12 | ||||
| -rwxr-xr-x | testdummy.sh | 6 | ||||
| -rwxr-xr-x | testmain.sh | 19 |
4 files changed, 30 insertions, 9 deletions
diff --git a/tabulate.sh b/tabulate.sh new file mode 100755 index 0000000..3db27e5 --- /dev/null +++ b/tabulate.sh @@ -0,0 +1,2 @@ +#!/bin/bash +for i in `seq 10 62`; do for j in `seq 1 1`; do echo -n "$i $j "; cat run_"$i"_"$j".txt | awk '/Elapsed/ || /Maximum/ || /User time/ || /System time/' | awk 'BEGIN{line=0}{if(line%4<=1)printf($4" ");if(line %4==2)printf($8" ");if(line%4==3)printf($6" ");}{line+=1}END{printf("\n");}'; done; done @@ -7,12 +7,12 @@ fi echo "Initializing..." ./server $1 csaa.db --overwrite > /dev/null & pid=$! -sleep 2 -time ./testcreate.sh ./client -time ./testmodify.sh ./client -time ./testretrieve.sh ./client -time ./testmodifyenc.sh ./client +sleep 1 +/usr/bin/time -v ./testcreate.sh ./client +/usr/bin/time -v ./testmodify.sh ./client +/usr/bin/time -v ./testretrieve.sh ./client +/usr/bin/time -v ./testmodifyenc.sh ./client echo "Encrypted retrieve: " -time ./testretrieve.sh ./client +/usr/bin/time -v ./testretrieve.sh ./client kill -SIGINT $! diff --git a/testdummy.sh b/testdummy.sh index e8c4222..7050655 100755 --- a/testdummy.sh +++ b/testdummy.sh @@ -5,7 +5,7 @@ sqlite3 csaa.db < sqlinit.txt ./dummy_server 10 csaa.db > /dev/null & pid=$! sleep 1 -time ./testcreate.sh ./dummy_client -time ./testmodify.sh ./dummy_client -time ./testretrieve.sh ./dummy_client +/usr/bin/time -v ./testcreate.sh ./dummy_client +/usr/bin/time -v ./testmodify.sh ./dummy_client +/usr/bin/time -v ./testretrieve.sh ./dummy_client kill -SIGINT $! diff --git a/testmain.sh b/testmain.sh new file mode 100755 index 0000000..1bb6fc7 --- /dev/null +++ b/testmain.sh @@ -0,0 +1,19 @@ +#!/bin/bash +mkdir -p results + +for i in `seq 1 1` +do + ./testdummy.sh 2> results/dummy_$i.txt + sleep 1 +done + +for i in `seq 8 62` +do + echo "logleaves "$i + for j in `seq 1 1` + do + ./testall.sh $i 2> results/run_"$i"_"$j".txt + # give time to close + sleep 1 + done +done |