git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[RFC PATCH 3/5] builtin/grep.c: add shorthand for &todo[todo_end] in add_work()

From
Rasmus Villemoes <rv@rasmusvillemoes.dk>
Date
Feb 12, 2019, 22:26 UTC
Message-ID
<20190212222654.7432-4-rv@rasmusvillemoes.dk>
In-Reply-To
<20190212222654.7432-1-rv@rasmusvillemoes.dk>
Signed-off-by: Rasmus Villemoes <rv@rasmusvillemoes.dk>
---
 builtin/grep.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 211ae54222..92b9e6198d 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -93,18 +93,20 @@ static int skip_first_line;
 
 static void add_work(struct grep_opt *opt, const struct grep_source *gs)
 {
+	struct work_item *w;
+
 	grep_lock();
 
 	while ((todo_end+1) % ARRAY_SIZE(todo) == todo_done) {
 		pthread_cond_wait(&cond_write, &grep_mutex);
 	}
 
-	todo[todo_end].source = *gs;
+	w = &todo[todo_end];
+	w->source = *gs;
 	if (opt->binary != GREP_BINARY_TEXT)
-		grep_source_load_driver(&todo[todo_end].source,
-					opt->repo->index);
-	todo[todo_end].done = 0;
-	strbuf_reset(&todo[todo_end].out);
+		grep_source_load_driver(&w->source, opt->repo->index);
+	w->done = 0;
+	strbuf_reset(&w->out);
 	todo_end = (todo_end + 1) % ARRAY_SIZE(todo);
 
 	pthread_cond_signal(&cond_add);
-- 
2.20.1
Previous: Rasmus Villemoes
Message 6 of 6 in “builtin/grep.c: fix a tiny logic flaw”
  1. 0/5 builtin/grep.c: fix a tiny logic flawRasmus Villemoes, Feb 12, 2019
  2. 1/5 builtin/grep.c: change todo_* variables to unsignedRasmus Villemoes, Feb 12, 2019
  3. 2/5 builtin/grep.c: refactor loop in work_done() slightlyRasmus Villemoes, Feb 12, 2019
  4. 4/5 builtin/grep.c: add todo_item helperRasmus Villemoes, Feb 12, 2019
  5. 5/5 builtin/grep.c: fix fence-post error in add_work()Rasmus Villemoes, Feb 12, 2019
  6. 3/5 builtin/grep.c: add shorthand for &todo[todo_end] in add_work()Rasmus Villemoes, Feb 12, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.