修改测试脚本

.gitignore

@@ -56,6 +56,8 @@ runtime/tests/tmp/
 runtime/tests/**/*.csv
 runtime/tests/**/*.txt
 runtime/tests/**/*.xlsx
+runtime/tests/test_data/
+runtime/tests/**/*.log
 
 # Swap Files
 *.swp

runtime/tests/start.sh

@@ -21,9 +21,9 @@ echo $project_path
 path=`pwd`
 #export SLEDGE_DISABLE_PREEMPTION=true
 export SLEDGE_CPU_SPEED=2500
-export SLEDGE_SCHEDULER=EDF
+export SLEDGE_SCHEDULER=SRSF
-export SLEDGE_SIGALRM_HANDLER=BROADCAST
+#export SLEDGE_SIGALRM_HANDLER=BROADCAST
-#export SLEDGE_SIGALRM_HANDLER=TRIAGED
+export SLEDGE_SIGALRM_HANDLER=TRIAGED
 export SLEDGE_NWORKERS=32
 #export SLEDGE_SCHEDULER=EDF
 export SLEDGE_SANDBOX_PERF_LOG=$path/$output

runtime/tests/start_test_single.sh

@@ -8,53 +8,123 @@ function usage {
 chmod 400 ./id_rsa
 path="/home/weihao/sledge/sledge_tree/runtime/tests"
 
-#test single c5 50% max RPS (500)
+#test single 5k c5 50% max RPS (500)
 f1="5k_single_50.txt"
 server_log_file="execution_single_5k_50.log"
 $path/start.sh $server_log_file >/dev/null 2>&1 &
 echo "sledge is running"
 ./test_8c.sh $f1 120 50 5k.jpg 10006 2>&1 &  
-pid5=$!
+pid1=$!
-wait -f $pid5
+wait -f $pid1
 $path/kill_sledge.sh
 
 
-#test single c5 60% max RPS
+#test single 5k c5 60% max RPS
 f1="5k_single_60.txt"
 server_log_file="execution_single_5k_60.log"
 $path/start.sh $server_log_file >/dev/null 2>&1 &
 echo "sledge is running"
-./test_rps.sh $f1 30 60 5k.jpg 10006 2>&1 &  
+./test_rps.sh $f1 120 60 5k.jpg 10006 2>&1 &  
 pid1=$!
 wait -f $pid1
 $path/kill_sledge.sh
 
-#test single c5 70% max RPS
+#test single 5k c5 70% max RPS
 f1="5k_single_70.txt"
 server_log_file="execution_single_5k_70.log"
 $path/start.sh $server_log_file >/dev/null 2>&1 &
 echo "sledge is running"
-./test_rps.sh $f1 30 70 5k.jpg 10006 2>&1 &  
+./test_rps.sh $f1 120 70 5k.jpg 10006 2>&1 &  
-pid2=$!
+pid1=$!
-wait -f $pid2
+wait -f $pid1
 $path/kill_sledge.sh
 
-#test single c5 80% max RPS
+#test single 5k c5 80% max RPS
 f1="5k_single_80.txt"
 server_log_file="execution_single_5k_80.log"
 $path/start.sh $server_log_file >/dev/null 2>&1 &
 echo "sledge is running"
-./test_rps.sh $f1 30 80 5k.jpg 10006 2>&1 &  
+./test_rps.sh $f1 120 80 5k.jpg 10006 2>&1 &  
-pid3=$!
+pid1=$!
-wait -f $pid3
+wait -f $pid1
 $path/kill_sledge.sh
 
-#test single c5 90% max RPS
+#test single 5k c5 90% max RPS
 f1="5k_single_90.txt"
 server_log_file="execution_single_5k_90.log"
 $path/start.sh $server_log_file >/dev/null 2>&1 &
 echo "sledge is running"
-./test_rps.sh $f1 30 90 5k.jpg 10006 2>&1 &  
+./test_rps.sh $f1 120 90 5k.jpg 10006 2>&1 &  
-pid4=$!
+pid1=$!
-wait -f $pid4
+wait -f $pid1
+$path/kill_sledge.sh
+
+#test single 5k c5 99% max RPS
+f1="5k_single_99.txt"
+server_log_file="execution_single_5k_99.log"
+$path/start.sh $server_log_file >/dev/null 2>&1 &
+echo "sledge is running"
+./test_rps.sh $f1 120 100 5k.jpg 10006 2>&1 &  
+pid1=$!
+wait -f $pid1
+$path/kill_sledge.sh
+
+#test single 105k c5 50% max RPS (135)
+f1="105k_single_50.txt"
+server_log_file="execution_single_105k_50.log"
+$path/start.sh $server_log_file >/dev/null 2>&1 &
+echo "sledge is running"
+./test_8c.sh $f1 120 13 5k.jpg 10000 2>&1 &  
+pid2=$!
+wait -f $pid2
+$path/kill_sledge.sh
+
+#test single 105k c5 60% max RPS
+f1="105k_single_60.txt"
+server_log_file="execution_single_105k_60.log"
+$path/start.sh $server_log_file >/dev/null 2>&1 &
+echo "sledge is running"
+./test_8c.sh $f1 120 16 5k.jpg 10000 2>&1 &  
+pid2=$!
+wait -f $pid2
+$path/kill_sledge.sh
+
+#test single 105k c5 70% max RPS
+f1="105k_single_70.txt"
+server_log_file="execution_single_105k_70.log"
+$path/start.sh $server_log_file >/dev/null 2>&1 &
+echo "sledge is running"
+./test_8c.sh $f1 120 19 5k.jpg 10000 2>&1 &  
+pid2=$!
+wait -f $pid2
+$path/kill_sledge.sh
+
+#test single 105k c5 80% max RPS
+f1="105k_single_80.txt"
+server_log_file="execution_single_105k_80.log"
+$path/start.sh $server_log_file >/dev/null 2>&1 &
+echo "sledge is running"
+./test_8c.sh $f1 120 22 5k.jpg 10000 2>&1 &  
+pid2=$!
+wait -f $pid2
+$path/kill_sledge.sh
+
+#test single 105k c5 90% max RPS
+f1="105k_single_90.txt"
+server_log_file="execution_single_105k_90.log"
+$path/start.sh $server_log_file >/dev/null 2>&1 &
+echo "sledge is running"
+./test_8c.sh $f1 120 25 5k.jpg 10000 2>&1 &  
+pid2=$!
+wait -f $pid2
+$path/kill_sledge.sh
+
+#test single 105k c5 99% max RPS
+f1="105k_single_99.txt"
+server_log_file="execution_single_105k_99.log"
+$path/start.sh $server_log_file >/dev/null 2>&1 &
+echo "sledge is running"
+./test_8c.sh $f1 120 27 5k.jpg 10000 2>&1 &  
+pid2=$!
+wait -f $pid2
 $path/kill_sledge.sh