[PATCH 1/7] grep: move thread initialization a little lower
- From
Jeff King <peff@peff.net>
- Date
- Feb 14, 2017, 06:02 UTC
- Message-ID
- <20170214060237.gvzzbmjzerlqnzjv@sigill.intra.peff.net>
- In-Reply-To
- <20170214060021.einv7372exbxa23z@sigill.intra.peff.net>
Originally, we set up the threads for grep before parsing the non-option arguments. In 53b8d931b (grep: disable threading in non-worktree case, 2011-12-12), the thread code got bumped lower in the function because it now needed to know whether we got any revision arguments.
That put a big block of code in between the parsing of revs and the parsing of pathspecs, both of which share some loop variables. That makes it harder to read the code than the original, where the shared loops were right next to each other.
Let's bump the thread initialization until after all of the parsing is done.
Signed-off-by: Jeff King <peff@peff.net> --- I double-checked to make sure no other code was relying on the thread setup having happened. I think we could actually bump it quite a bit lower (to right before we actually start grepping), but I doubt it matters much in practice.
builtin/grep.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c index 2c727ef49..5a282c4d0 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1169,6 +1169,20 @@ int cmd_grep(int argc, const char **argv, const char *prefix) break; } + /* The rest are paths */ + if (!seen_dashdash) { + int j; + for (j = i; j < argc; j++) + verify_filename(prefix, argv[j], j == i); + } + + parse_pathspec(&pathspec, 0, + PATHSPEC_PREFER_CWD | + (opt.max_depth != -1 ? PATHSPEC_MAXDEPTH_VALID : 0), + prefix, argv + i); + pathspec.max_depth = opt.max_depth; + pathspec.recursive = 1; + #ifndef NO_PTHREADS if (list.nr || cached || show_in_pager) num_threads = 0; @@ -1190,20 +1204,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix) } #endif - /* The rest are paths */ - if (!seen_dashdash) { - int j; - for (j = i; j < argc; j++) - verify_filename(prefix, argv[j], j == i); - } - - parse_pathspec(&pathspec, 0, - PATHSPEC_PREFER_CWD | - (opt.max_depth != -1 ? PATHSPEC_MAXDEPTH_VALID : 0), - prefix, argv + i); - pathspec.max_depth = opt.max_depth; - pathspec.recursive = 1; - if (recurse_submodules) { gitmodules_config(); compile_submodule_options(&opt, &pathspec, cached, untracked,
-- 2.12.0.rc1.471.ga79ec8999