development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 12:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rv/grep-cleanup'

Browse source 
Threaded "git grep" has been optimized to avoid allocation in code
section that is covered under a mutex.

* rv/grep-cleanup:
  grep: simplify grep_oid and grep_file
  grep: move grep_source_init outside critical section
This commit is contained in:
Junio C Hamano 2018-03-08 12:36:25 -08:00
parent 9e69a1484f 38ef24dccf
commit 5fc4a7ed5d
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
builtin/grep.c
View file

@ -92,8 +92,7 @@ static pthread_cond_t cond_result;
static int skip_first_line; static int skip_first_line;
static void add_work(struct grep_opt *opt, enum grep_source_type type, static void add_work(struct grep_opt *opt, const struct grep_source *gs)
const char *name, const char *path, const void *id)
{ {
grep_lock(); grep_lock();
@ -101,7 +100,7 @@ static void add_work(struct grep_opt *opt, enum grep_source_type type,
pthread_cond_wait(&cond_write, &grep_mutex); pthread_cond_wait(&cond_write, &grep_mutex);
} }
grep_source_init(&todo[todo_end].source, type, name, path, id); todo[todo_end].source = *gs;
if (opt->binary != GREP_BINARY_TEXT) if (opt->binary != GREP_BINARY_TEXT)
grep_source_load_driver(&todo[todo_end].source); grep_source_load_driver(&todo[todo_end].source);
todo[todo_end].done = 0; todo[todo_end].done = 0;
@ -317,6 +316,7 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
const char *path) const char *path)
{ {
struct strbuf pathbuf = STRBUF_INIT; struct strbuf pathbuf = STRBUF_INIT;
struct grep_source gs;
if (opt->relative && opt->prefix_length) { if (opt->relative && opt->prefix_length) {
quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf); quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf);
@ -325,19 +325,22 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
strbuf_addstr(&pathbuf, filename); strbuf_addstr(&pathbuf, filename);
} }
grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
strbuf_release(&pathbuf);
#ifndef NO_PTHREADS #ifndef NO_PTHREADS
if (num_threads) { if (num_threads) {
add_work(opt, GREP_SOURCE_OID, pathbuf.buf, path, oid); /*
strbuf_release(&pathbuf); * add_work() copies gs and thus assumes ownership of
* its fields, so do not call grep_source_clear()
*/
add_work(opt, &gs);
return 0; return 0;
} else } else
#endif #endif
{ {
struct grep_source gs;
int hit; int hit;
grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
strbuf_release(&pathbuf);
hit = grep_source(opt, &gs); hit = grep_source(opt, &gs);
grep_source_clear(&gs); grep_source_clear(&gs);
@ -348,25 +351,29 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
static int grep_file(struct grep_opt *opt, const char *filename) static int grep_file(struct grep_opt *opt, const char *filename)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct grep_source gs;
if (opt->relative && opt->prefix_length) if (opt->relative && opt->prefix_length)
quote_path_relative(filename, opt->prefix, &buf); quote_path_relative(filename, opt->prefix, &buf);
else else
strbuf_addstr(&buf, filename); strbuf_addstr(&buf, filename);
grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
strbuf_release(&buf);
#ifndef NO_PTHREADS #ifndef NO_PTHREADS
if (num_threads) { if (num_threads) {
add_work(opt, GREP_SOURCE_FILE, buf.buf, filename, filename); /*
strbuf_release(&buf); * add_work() copies gs and thus assumes ownership of
* its fields, so do not call grep_source_clear()
*/
add_work(opt, &gs);
return 0; return 0;
} else } else
#endif #endif
{ {
struct grep_source gs;
int hit; int hit;
grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
strbuf_release(&buf);
hit = grep_source(opt, &gs); hit = grep_source(opt, &gs);
grep_source_clear(&gs); grep_source_clear(&gs);