Prechádzať zdrojové kódy

Improve ENDTIME accuracy

Ben Adams 6 rokov pred
rodič
commit
7b51acfabb

+ 1 - 4
toolset/wrk/concurrency.sh

@@ -27,9 +27,6 @@ echo " Concurrency: $c for $name"
 echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $c --timeout 8 -t $(($c>$max_threads?$max_threads:$c)) \"$url\""
 echo "---------------------------------------------------------"
 echo ""
-STARTTIME=$(date +"%s")
-wrk -H "Host: $server_host" -H "Accept: $accept" -H "Connection: keep-alive" --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url
-echo "STARTTIME $STARTTIME"
-echo "ENDTIME $(date +"%s")"
+((/usr/bin/time --format="STARTTIME 0\nENDTIME %e" wrk -H "Host: $server_host" -H "Accept: $accept" -H "Connection: keep-alive" --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url ) 2>&1 )
 sleep 2
 done

+ 1 - 4
toolset/wrk/pipeline.sh

@@ -27,9 +27,6 @@ echo " Concurrency: $c for $name"
 echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $c --timeout 8 -t $(($c>$max_threads?$max_threads:$c)) $url -s pipeline.lua -- $pipeline"
 echo "---------------------------------------------------------"
 echo ""
-STARTTIME=$(date +"%s")
-wrk -H "Host: $server_host" -H "Accept: $accept" -H "Connection: keep-alive" --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url -s pipeline.lua -- $pipeline
-echo "STARTTIME $STARTTIME"
-echo "ENDTIME $(date +"%s")"
+((/usr/bin/time --format="STARTTIME 0\nENDTIME %e" wrk -H "Host: $server_host" -H "Accept: $accept" -H "Connection: keep-alive" --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url -s pipeline.lua -- $pipeline ) 2>&1 )
 sleep 2
 done

+ 1 - 4
toolset/wrk/query.sh

@@ -27,9 +27,6 @@ echo " Queries: $c for $name"
 echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads \"$url$c\""
 echo "---------------------------------------------------------"
 echo ""
-STARTTIME=$(date +"%s")
-wrk -H "Host: $server_host" -H "Accept: $accept" -H "Connection: keep-alive" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads "$url$c"
-echo "STARTTIME $STARTTIME"
-echo "ENDTIME $(date +"%s")"
+((/usr/bin/time --format="STARTTIME 0\nENDTIME %e" wrk -H "Host: $server_host" -H "Accept: $accept" -H "Connection: keep-alive" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads "$url$c" ) 2>&1 )
 sleep 2
 done