From: Rasmus Villemoes <rv@rasmusvillemoes.dk>
To: git@vger.kernel.org
Cc: Rasmus Villemoes <rv@rasmusvillemoes.dk>
Subject: [RFC PATCH 4/5] builtin/grep.c: add todo_item helper
Date: Tue, 12 Feb 2019 23:26:53 +0100 [thread overview]
Message-ID: <20190212222654.7432-5-rv@rasmusvillemoes.dk> (raw)
In-Reply-To: <20190212222654.7432-1-rv@rasmusvillemoes.dk>
Use a helper for indexing into the todo array with any of the todo_*
variables, in preparation for not keeping those reduced mod TODO_SIZE.
Signed-off-by: Rasmus Villemoes <rv@rasmusvillemoes.dk>
---
builtin/grep.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 92b9e6198d..35ed79b0dd 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -62,6 +62,11 @@ static unsigned int todo_start;
static unsigned int todo_end;
static unsigned int todo_done;
+static inline struct work_item *todo_item(unsigned int idx)
+{
+ return &todo[idx % ARRAY_SIZE(todo)];
+}
+
/* Has all work items been added? */
static int all_work_added;
@@ -101,7 +106,7 @@ static void add_work(struct grep_opt *opt, const struct grep_source *gs)
pthread_cond_wait(&cond_write, &grep_mutex);
}
- w = &todo[todo_end];
+ w = todo_item(todo_end);
w->source = *gs;
if (opt->binary != GREP_BINARY_TEXT)
grep_source_load_driver(&w->source, opt->repo->index);
@@ -125,7 +130,7 @@ static struct work_item *get_work(void)
if (todo_start == todo_end && all_work_added) {
ret = NULL;
} else {
- ret = &todo[todo_start];
+ ret = todo_item(todo_start);
todo_start = (todo_start + 1) % ARRAY_SIZE(todo);
}
grep_unlock();
@@ -141,7 +146,7 @@ static void work_done(struct work_item *w)
old_done = todo_done;
for(; todo_done != todo_start;
todo_done = (todo_done+1) % ARRAY_SIZE(todo)) {
- w = &todo[todo_done];
+ w = todo_item(todo_done);
if (!w->done)
break;
if (w->out.len) {
--
2.20.1
next prev parent reply other threads:[~2019-02-12 22:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 22:26 [RFC PATCH 0/5] builtin/grep.c: fix a tiny logic flaw Rasmus Villemoes
2019-02-12 22:26 ` [RFC PATCH 1/5] builtin/grep.c: change todo_* variables to unsigned Rasmus Villemoes
2019-02-12 22:26 ` [RFC PATCH 2/5] builtin/grep.c: refactor loop in work_done() slightly Rasmus Villemoes
2019-02-12 22:26 ` [RFC PATCH 3/5] builtin/grep.c: add shorthand for &todo[todo_end] in add_work() Rasmus Villemoes
2019-02-12 22:26 ` Rasmus Villemoes [this message]
2019-02-12 22:26 ` [RFC PATCH 5/5] builtin/grep.c: fix fence-post error " Rasmus Villemoes
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=20190212222654.7432-5-rv@rasmusvillemoes.dk \
--to=rv@rasmusvillemoes.dk \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.