From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Ben Maurer <bmaurer@fb.com>,
Siddharth Agarwal <sid0@fb.com>
Subject: Re: [PATCH 1/6] t/perf-lib: factor boilerplate out of test_perf
Date: Wed, 26 Mar 2014 15:34:23 -0700 [thread overview]
Message-ID: <xmqqr45oh9n4.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140326072232.GA32193@sigill.intra.peff.net> (Jeff King's message of "Wed, 26 Mar 2014 03:22:33 -0400")
Jeff King <peff@peff.net> writes:
> About half of test_perf() is boilerplate, and half is
> actually related to running the perf test. Let's split it
> into two functions, so that we can reuse the boilerplate in
> future commits.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> t/perf/perf-lib.sh | 61 +++++++++++++++++++++++++++++++-----------------------
> 1 file changed, 35 insertions(+), 26 deletions(-)
These early steps somewhat conflict with another topic that is
stalled (due to having no real users) on 'pu'. I do not think we
would terribly mind dropping tg/perf-lib-test-perf-cleanup and have
it rebased if the author or somebody else wants to have it in my
tree later, but just FYI.
>
> diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
> index a8c9574..20f306a 100644
> --- a/t/perf/perf-lib.sh
> +++ b/t/perf/perf-lib.sh
> @@ -150,8 +150,8 @@ exit $ret' >&3 2>&4
> return "$eval_ret"
> }
>
> -
> -test_perf () {
> +test_wrapper_ () {
> + test_wrapper_func_=$1; shift
> test_start_
> test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
> test "$#" = 2 ||
> @@ -162,35 +162,44 @@ test_perf () {
> base=$(basename "$0" .sh)
> echo "$test_count" >>"$perf_results_dir"/$base.subtests
> echo "$1" >"$perf_results_dir"/$base.$test_count.descr
> - if test -z "$verbose"; then
> - printf "%s" "perf $test_count - $1:"
> - else
> - echo "perf $test_count - $1:"
> - fi
> - for i in $(test_seq 1 $GIT_PERF_REPEAT_COUNT); do
> - say >&3 "running: $2"
> - if test_run_perf_ "$2"
> - then
> - if test -z "$verbose"; then
> - printf " %s" "$i"
> - else
> - echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:"
> - fi
> + base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
> + "$test_wrapper_func_" "$@"
> + fi
> +
> + test_finish_
> +}
> +
> +test_perf_ () {
> + if test -z "$verbose"; then
> + printf "%s" "perf $test_count - $1:"
> + else
> + echo "perf $test_count - $1:"
> + fi
> + for i in $(test_seq 1 $GIT_PERF_REPEAT_COUNT); do
> + say >&3 "running: $2"
> + if test_run_perf_ "$2"
> + then
> + if test -z "$verbose"; then
> + printf " %s" "$i"
> else
> - test -z "$verbose" && echo
> - test_failure_ "$@"
> - break
> + echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:"
> fi
> - done
> - if test -z "$verbose"; then
> - echo " ok"
> else
> - test_ok_ "$1"
> + test -z "$verbose" && echo
> + test_failure_ "$@"
> + break
> fi
> - base="$perf_results_dir"/"$perf_results_prefix$(basename "$0" .sh)"."$test_count"
> - "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
> + done
> + if test -z "$verbose"; then
> + echo " ok"
> + else
> + test_ok_ "$1"
> fi
> - test_finish_
> + "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
> +}
> +
> +test_perf () {
> + test_wrapper_ test_perf_ "$@"
> }
>
> # We extend test_done to print timings at the end (./run disables this
next prev parent reply other threads:[~2014-03-26 22:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-26 7:22 [PATCH/RFC 0/6] reuse deltas found by bitmaps Jeff King
2014-03-26 7:22 ` [PATCH 1/6] t/perf-lib: factor boilerplate out of test_perf Jeff King
2014-03-26 22:34 ` Junio C Hamano [this message]
2014-03-26 7:22 ` [PATCH 2/6] t/perf/aggregate: factor our percent calculations Jeff King
2014-03-26 7:22 ` [PATCH 3/6] t/perf: add infrastructure for measuring sizes Jeff King
2014-03-26 7:22 ` [PATCH 4/6] t/perf: add perf tests for fetches from a bitmapped server Jeff King
2014-03-26 7:23 ` [PATCH 5/6] pack-bitmap: save "have" bitmap from walk Jeff King
2014-03-26 7:23 ` [PATCH 6/6] pack-objects: reuse deltas for thin "have" objects Jeff King
2014-03-28 4:23 ` Eric Sunshine
2014-03-26 17:33 ` [PATCH/RFC 0/6] reuse deltas found by bitmaps Junio C Hamano
2014-03-26 18:13 ` Jeff King
2014-03-26 22:31 ` Junio C Hamano
2014-03-26 22:36 ` Jeff King
2014-03-27 1:13 ` Jeff King
2014-03-27 16:36 ` Junio C Hamano
2014-03-26 22:40 ` Siddharth Agarwal
2014-03-27 14:09 ` Siddharth Agarwal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr45oh9n4.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=bmaurer@fb.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sid0@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).