From 08dc78bcc5217f3bd67c6eab9d57a4b6f6ee96bb Mon Sep 17 00:00:00 2001 From: mdr0id Date: Thu, 12 Jan 2023 07:18:23 -0800 Subject: [PATCH] update memory targets with heaptrack --- qa/zcash/performance-measurements.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/qa/zcash/performance-measurements.sh b/qa/zcash/performance-measurements.sh index aedcf560e..bd8b1feb5 100755 --- a/qa/zcash/performance-measurements.sh +++ b/qa/zcash/performance-measurements.sh @@ -86,7 +86,7 @@ function zcashd_stop { wait $ZCASHD_PID } -function zcashd_massif_start { +function zcashd_heaptrack_start { case "$1" in sendtoaddress|loadwallet|listunspent) case "$2" in @@ -97,7 +97,7 @@ function zcashd_massif_start { use_200k_benchmark 1 ;; *) - echo "Bad arguments to zcashd_massif_start." + echo "Bad arguments to zcashd_heaptrack_start." exit 1 esac ;; @@ -106,16 +106,14 @@ function zcashd_massif_start { mkdir -p "$DATADIR/regtest" touch "$DATADIR/zcash.conf" esac - rm -f massif.out - valgrind --tool=massif --time-unit=ms --massif-out-file=massif.out ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & + heaptrack ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 -showmetrics=0 & ZCASHD_PID=$! zcash_rpc_wait_for_start } -function zcashd_massif_stop { +function zcashd_heaptrack_stop { zcash_rpc stop > /dev/null wait $ZCASHD_PID - ms_print massif.out } function zcashd_valgrind_start { @@ -258,7 +256,7 @@ case "$1" in zcashd_stop ;; memory) - zcashd_massif_start "${@:2}" + zcashd_heaptrack_start "${@:2}" case "$2" in sleep) zcash_rpc zcbenchmark sleep 1 @@ -321,12 +319,11 @@ case "$1" in zcash_rpc zcbenchmark listunspent 1 ;; *) - zcashd_massif_stop + zcashd_heaptrack_stop echo "Bad arguments to memory." exit 1 esac - zcashd_massif_stop - rm -f massif.out + zcashd_heaptrack_stop ;; valgrind) zcashd_valgrind_start