From: Brandon Williams <bmwill@google.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Jeff King" <peff@peff.net>,
"Jeffrey Walton" <noloader@gmail.com>,
"Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>,
"J Smith" <dark.panda@gmail.com>,
"Victor Leschuk" <vleschuk@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Fredrik Kuivinen" <frekui@gmail.com>
Subject: Re: [PATCH 28/29] grep: given --threads with NO_PTHREADS=YesPlease, warn
Date: Thu, 11 May 2017 13:21:31 -0700 [thread overview]
Message-ID: <20170511202131.GK83655@google.com> (raw)
In-Reply-To: <20170511091829.5634-29-avarab@gmail.com>
On 05/11, Ævar Arnfjörð Bjarmason wrote:
> Add a warning about missing thread support when grep.threads or
> --threads is set to a non 0 (default) or 1 (no parallelism) value
> under NO_PTHREADS=YesPlease.
>
> This is for consistency with the index-pack & pack-objects commands,
> which also take a --threads option & are configurable via
> pack.threads, and have long warned about the same under
> NO_PTHREADS=YesPlease.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> builtin/grep.c | 11 +++++++++++
> t/t7810-grep.sh | 18 ++++++++++++++++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 1c0adb30f3..f4e08dd2b6 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -289,6 +289,15 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
> if (num_threads < 0)
> die(_("invalid number of threads specified (%d) for %s"),
> num_threads, var);
> +#ifdef NO_PTHREADS
> + else if (num_threads && num_threads != 1) {
> + /* TRANSLATORS: %s is the configuration
> + variable for tweaking threads, currently
> + grep.threads */
nit: this comment isn't formatted properly:
/*
* ... comment ...
*/
> + warning(_("no threads support, ignoring %s"), var);
> + num_threads = 0;
> + }
> +#endif
> }
>
> return st;
> @@ -1233,6 +1242,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
> else if (num_threads < 0)
> die(_("invalid number of threads specified (%d)"), num_threads);
> #else
> + if (num_threads)
> + warning(_("no threads support, ignoring --threads"));
> num_threads = 0;
> #endif
>
> diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
> index 561709ef6a..f106387820 100755
> --- a/t/t7810-grep.sh
> +++ b/t/t7810-grep.sh
> @@ -791,6 +791,24 @@ do
> "
> done
>
> +test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'grep --threads=N or pack.threads=N warns when no pthreads' '
> + git grep --threads=2 Hello hello_world 2>err &&
> + grep ^warning: err >warnings &&
> + test_line_count = 1 warnings &&
> + grep -F "no threads support, ignoring --threads" err &&
> + git -c grep.threads=2 grep Hello hello_world 2>err &&
> + grep ^warning: err >warnings &&
> + test_line_count = 1 warnings &&
> + grep -F "no threads support, ignoring grep.threads" err &&
> + git -c grep.threads=2 grep --threads=4 Hello hello_world 2>err &&
> + grep ^warning: err >warnings &&
> + test_line_count = 2 warnings &&
> + grep -F "no threads support, ignoring --threads" err &&
> + grep -F "no threads support, ignoring grep.threads" err &&
> + git -c grep.threads=0 grep --threads=0 Hello hello_world 2>err &&
> + test_line_count = 0 err
> +'
> +
Same bit about doing the correct checks on the error strings to account
for translation.
> test_expect_success 'grep from a subdirectory to search wider area (1)' '
> mkdir -p s &&
> (
> --
> 2.11.0
>
--
Brandon Williams
next prev parent reply other threads:[~2017-05-11 20:21 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-11 9:18 [PATCH 00/29] Easy to review grep & pre-PCRE changes Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 01/29] Makefile & configure: reword inaccurate comment about PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 02/29] grep & rev-list doc: stop promising libpcre for --perl-regexp Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 03/29] test-lib: rename the LIBPCRE prerequisite to PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 04/29] log: add exhaustive tests for pattern style options & config Ævar Arnfjörð Bjarmason
2017-05-12 4:48 ` Junio C Hamano
2017-05-13 18:02 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 05/29] grep: add a test asserting that --perl-regexp dies when !PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 06/29] grep: add a test for backreferences in PCRE patterns Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 07/29] grep: change non-ASCII -i test to stop using --debug Ævar Arnfjörð Bjarmason
2017-05-11 18:31 ` Brandon Williams
2017-05-11 18:35 ` Ævar Arnfjörð Bjarmason
2017-05-11 20:05 ` Brandon Williams
2017-05-11 9:18 ` [PATCH 08/29] grep: add tests for --threads=N and grep.threads Ævar Arnfjörð Bjarmason
2017-05-11 18:36 ` Brandon Williams
2017-05-11 19:22 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 09/29] grep: amend submodule recursion test for regex engine testing Ævar Arnfjörð Bjarmason
2017-05-12 4:59 ` Junio C Hamano
2017-05-13 17:33 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 10/29] grep: add tests for grep pattern types being passed to submodules Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 11/29] grep: add a test helper function for less verbose -f \0 tests Ævar Arnfjörð Bjarmason
2017-05-12 5:06 ` Junio C Hamano
2017-05-13 11:33 ` Ævar Arnfjörð Bjarmason
2017-05-15 1:29 ` Junio C Hamano
2017-05-11 9:18 ` [PATCH 12/29] grep: prepare for testing binary regexes containing rx metacharacters Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 13/29] grep: add tests to fix blind spots with \0 patterns Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 14/29] perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't do Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 15/29] perf: emit progress output when unpacking & building Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 16/29] perf: add a performance comparison test of grep -G, -E and -P Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 17/29] perf: add a performance comparison of fixed-string grep Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 18/29] grep: catch a missing enum in switch statement Ævar Arnfjörð Bjarmason
2017-05-11 20:08 ` Brandon Williams
2017-05-11 20:40 ` Stefan Beller
2017-05-11 20:50 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 19/29] grep: remove redundant regflags assignment under PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 20/29] grep: remove redundant `regflags &= ~REG_EXTENDED` assignments Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 21/29] grep: factor test for \0 in grep patterns into a function Ævar Arnfjörð Bjarmason
2017-05-11 20:15 ` Brandon Williams
2017-05-11 20:22 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 22/29] grep: change the internal PCRE macro names to be PCRE1 Ævar Arnfjörð Bjarmason
2017-05-11 20:10 ` Brandon Williams
2017-05-11 9:18 ` [PATCH 23/29] grep: change internal *pcre* variable & function names to be *pcre1* Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 24/29] grep: move two functions to avoid forward declaration Ævar Arnfjörð Bjarmason
2017-05-11 20:14 ` Brandon Williams
2017-05-11 20:20 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 25/29] test-lib: add a PTHREADS prerequisite Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 26/29] pack-objects & index-pack: add test for --threads warning Ævar Arnfjörð Bjarmason
2017-05-11 20:17 ` Brandon Williams
2017-05-11 20:34 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 27/29] pack-objects: fix buggy warning about threads Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 28/29] grep: given --threads with NO_PTHREADS=YesPlease, warn Ævar Arnfjörð Bjarmason
2017-05-11 20:21 ` Brandon Williams [this message]
2017-05-11 20:33 ` Ævar Arnfjörð Bjarmason
2017-05-11 20:43 ` Brandon Williams
2017-05-11 21:20 ` [PATCH] C style: use standard style for "TRANSLATORS" comments Ævar Arnfjörð Bjarmason
2017-05-11 21:41 ` Jonathan Nieder
2017-05-11 21:50 ` Brandon Williams
2017-05-12 5:20 ` Johannes Sixt
2017-05-30 16:02 ` Jiang Xin
2017-05-30 23:03 ` Junio C Hamano
2017-05-11 9:18 ` [PATCH 29/29] grep: assert that threading is enabled when calling grep_{lock,unlock} Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170511202131.GK83655@google.com \
--to=bmwill@google.com \
--cc=avarab@gmail.com \
--cc=dark.panda@gmail.com \
--cc=frekui@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michal.kiedrowicz@gmail.com \
--cc=noloader@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=vleschuk@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).