Merge branch 'rs/sort-oid-array-thread-safe'

gitster · gitster · commit 2743b61bc651 · 2019-09-09T12:26:39.000-07:00
Prepare get_short_oid() codepath to be thread-safe.

* rs/sort-oid-array-thread-safe:
  sha1-name: make sort_ambiguous_oid_array() thread-safe
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -403,9 +403,9 @@ static int repo_collect_ambiguous(struct repository *r,`
`403`	`403`	`return collect_ambiguous(oid, data);`
`404`	`404`	`}`
`405`	`405`
`406`		`-static struct repository *sort_ambiguous_repo;`
`407`		`-static int sort_ambiguous(const void a, const void b)`
	`406`	`+static int sort_ambiguous(const void a, const void b, void *ctx)`
`408`	`407`	`{`
	`408`	`+ struct repository *sort_ambiguous_repo = ctx;`
`409`	`409`	`int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);`
`410`	`410`	`int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);`
`411`	`411`	`int a_type_sort;`
`@@ -434,10 +434,7 @@ static int sort_ambiguous(const void a, const void b)`
`434`	`434`
`435`	`435`	`static void sort_ambiguous_oid_array(struct repository r, struct oid_array a)`
`436`	`436`	`{`
`437`		`- /* mutex will be needed if this code is to be made thread safe */`
`438`		`- sort_ambiguous_repo = r;`
`439`		`- QSORT(a->oid, a->nr, sort_ambiguous);`
`440`		`- sort_ambiguous_repo = NULL;`
	`437`	`+ QSORT_S(a->oid, a->nr, sort_ambiguous, r);`
`441`	`438`	`}`
`442`	`439`
`443`	`440`	`static enum get_oid_result get_short_oid(struct repository *r,`