Auto merge of #2640 - str4d:perf-benchmark-fixes, r=str4d

Perf benchmark fixes
This commit is contained in:
Homu 2017-09-27 11:51:08 -07:00
commit e2ef206ee3
1 changed files with 10 additions and 7 deletions

View File

@ -65,7 +65,7 @@ function zcashd_start {
use_200k_benchmark 1
;;
*)
echo "Bad arguments."
echo "Bad arguments to zcashd_start."
exit 1
esac
;;
@ -95,7 +95,7 @@ function zcashd_massif_start {
use_200k_benchmark 1
;;
*)
echo "Bad arguments."
echo "Bad arguments to zcashd_massif_start."
exit 1
esac
;;
@ -208,7 +208,7 @@ case "$1" in
;;
*)
zcashd_stop
echo "Bad arguments."
echo "Bad arguments to time."
exit 1
esac
zcashd_stop
@ -247,9 +247,12 @@ case "$1" in
sendtoaddress)
zcash_rpc zcbenchmark sendtoaddress 1 "${@:4}"
;;
loadwallet)
# The initial load is sufficient for measurement
;;
*)
zcashd_massif_stop
echo "Bad arguments."
echo "Bad arguments to memory."
exit 1
esac
zcashd_massif_stop
@ -288,7 +291,7 @@ case "$1" in
;;
*)
zcashd_valgrind_stop
echo "Bad arguments."
echo "Bad arguments to valgrind."
exit 1
esac
zcashd_valgrind_stop
@ -309,12 +312,12 @@ case "$1" in
rm -f valgrind.out
;;
*)
echo "Bad arguments."
echo "Bad arguments to valgrind-tests."
exit 1
esac
;;
*)
echo "Bad arguments."
echo "Invalid benchmark type."
exit 1
esac