| Message ID | a08751c7-170d-7faf-272e-79c589ec3eab@web.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sha1-name: make sort_ambiguous_oid_array() thread-safe | expand |
On 8/20/2019 2:49 PM, René Scharfe wrote: > Use QSORT_S instead of QSORT, which allows passing the repository > pointer to the comparison function without using a static variable. Makes sense. > -static struct repository *sort_ambiguous_repo; > -static int sort_ambiguous(const void *a, const void *b) > +static int sort_ambiguous(const void *a, const void *b, void *ctx) > { > + struct repository *sort_ambiguous_repo = ctx; > int a_type = oid_object_info(sort_ambiguous_repo, a, NULL); > int b_type = oid_object_info(sort_ambiguous_repo, b, NULL); > int a_type_sort; > @@ -434,10 +434,7 @@ static int sort_ambiguous(const void *a, const void *b) > > static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a) > { > - /* mutex will be needed if this code is to be made thread safe */ > - sort_ambiguous_repo = r; > - QSORT(a->oid, a->nr, sort_ambiguous); > - sort_ambiguous_repo = NULL; > + QSORT_S(a->oid, a->nr, sort_ambiguous, r); > } LGTM! Thanks, -Stolee
diff --git a/sha1-name.c b/sha1-name.c index 2989e27b71..c665e3f96d 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -403,9 +403,9 @@ static int repo_collect_ambiguous(struct repository *r, return collect_ambiguous(oid, data); } -static struct repository *sort_ambiguous_repo; -static int sort_ambiguous(const void *a, const void *b) +static int sort_ambiguous(const void *a, const void *b, void *ctx) { + struct repository *sort_ambiguous_repo = ctx; int a_type = oid_object_info(sort_ambiguous_repo, a, NULL); int b_type = oid_object_info(sort_ambiguous_repo, b, NULL); int a_type_sort; @@ -434,10 +434,7 @@ static int sort_ambiguous(const void *a, const void *b) static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a) { - /* mutex will be needed if this code is to be made thread safe */ - sort_ambiguous_repo = r; - QSORT(a->oid, a->nr, sort_ambiguous); - sort_ambiguous_repo = NULL; + QSORT_S(a->oid, a->nr, sort_ambiguous, r); } static enum get_oid_result get_short_oid(struct repository *r,
Use QSORT_S instead of QSORT, which allows passing the repository pointer to the comparison function without using a static variable. Signed-off-by: René Scharfe <l.s.r@web.de> --- sha1-name.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.23.0