Use a larger -rpcclienttimeout for slow performance measurements

Closes #2238.
This commit is contained in:
Jack Grigg 2017-04-07 13:20:13 +12:00
parent f630519d86
commit 338ff45787
No known key found for this signature in database
GPG Key ID: 6A6914DAFBEA00DA
1 changed files with 15 additions and 5 deletions

View File

@ -8,6 +8,16 @@ function zcash_rpc {
./src/zcash-cli -datadir="$DATADIR" -rpcwait -rpcuser=user -rpcpassword=password -rpcport=5983 "$@" ./src/zcash-cli -datadir="$DATADIR" -rpcwait -rpcuser=user -rpcpassword=password -rpcport=5983 "$@"
} }
function zcash_rpc_slow {
# Timeout of 1 hour
./src/zcash-cli -datadir="$DATADIR" -rpcwait -rpcuser=user -rpcpassword=password -rpcport=5983 -rpcclienttimeout=3600 "$@"
}
function zcash_rpc_veryslow {
# Timeout of 2.5 hours
./src/zcash-cli -datadir="$DATADIR" -rpcwait -rpcuser=user -rpcpassword=password -rpcport=5983 -rpcclienttimeout=9000 "$@"
}
function zcashd_generate { function zcashd_generate {
zcash_rpc generate 101 > /dev/null zcash_rpc generate 101 > /dev/null
} }
@ -83,7 +93,7 @@ case "$1" in
zcash_rpc zcbenchmark verifyjoinsplit 1000 "\"$RAWJOINSPLIT\"" zcash_rpc zcbenchmark verifyjoinsplit 1000 "\"$RAWJOINSPLIT\""
;; ;;
solveequihash) solveequihash)
zcash_rpc zcbenchmark solveequihash 50 "${@:3}" zcash_rpc_slow zcbenchmark solveequihash 50 "${@:3}"
;; ;;
verifyequihash) verifyequihash)
zcash_rpc zcbenchmark verifyequihash 1000 zcash_rpc zcbenchmark verifyequihash 1000
@ -114,13 +124,13 @@ case "$1" in
zcash_rpc zcbenchmark parameterloading 1 zcash_rpc zcbenchmark parameterloading 1
;; ;;
createjoinsplit) createjoinsplit)
zcash_rpc zcbenchmark createjoinsplit 1 "${@:3}" zcash_rpc_slow zcbenchmark createjoinsplit 1 "${@:3}"
;; ;;
verifyjoinsplit) verifyjoinsplit)
zcash_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\"" zcash_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\""
;; ;;
solveequihash) solveequihash)
zcash_rpc zcbenchmark solveequihash 1 "${@:3}" zcash_rpc_slow zcbenchmark solveequihash 1 "${@:3}"
;; ;;
verifyequihash) verifyequihash)
zcash_rpc zcbenchmark verifyequihash 1 zcash_rpc zcbenchmark verifyequihash 1
@ -149,13 +159,13 @@ case "$1" in
zcash_rpc zcbenchmark parameterloading 1 zcash_rpc zcbenchmark parameterloading 1
;; ;;
createjoinsplit) createjoinsplit)
zcash_rpc zcbenchmark createjoinsplit 1 "${@:3}" zcash_rpc_veryslow zcbenchmark createjoinsplit 1 "${@:3}"
;; ;;
verifyjoinsplit) verifyjoinsplit)
zcash_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\"" zcash_rpc zcbenchmark verifyjoinsplit 1 "\"$RAWJOINSPLIT\""
;; ;;
solveequihash) solveequihash)
zcash_rpc zcbenchmark solveequihash 1 "${@:3}" zcash_rpc_veryslow zcbenchmark solveequihash 1 "${@:3}"
;; ;;
verifyequihash) verifyequihash)
zcash_rpc zcbenchmark verifyequihash 1 zcash_rpc zcbenchmark verifyequihash 1