From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 3/3] string-list: use QSORT_S in string_list_sort()
Date: Thu, 1 Dec 2016 17:29:05 +0100 [thread overview]
Message-ID: <adc18b5e-21f5-2a5f-b788-1181a8d56d3c@web.de> (raw)
In-Reply-To: <3083fbf7-d67e-77e4-e05f-94a7e7e15eba@web.de>
Pass the comparison function to cmp_items() via the context parameter of
qsort_s() instead of using a global variable. That allows calling
string_list_sort() from multiple parallel threads.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
string-list.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/string-list.c b/string-list.c
index 8c83cac18..45016ad86 100644
--- a/string-list.c
+++ b/string-list.c
@@ -211,21 +211,18 @@ struct string_list_item *string_list_append(struct string_list *list,
list->strdup_strings ? xstrdup(string) : (char *)string);
}
-/* Yuck */
-static compare_strings_fn compare_for_qsort;
-
-/* Only call this from inside string_list_sort! */
-static int cmp_items(const void *a, const void *b)
+static int cmp_items(const void *a, const void *b, void *ctx)
{
+ compare_strings_fn cmp = ctx;
const struct string_list_item *one = a;
const struct string_list_item *two = b;
- return compare_for_qsort(one->string, two->string);
+ return cmp(one->string, two->string);
}
void string_list_sort(struct string_list *list)
{
- compare_for_qsort = list->cmp ? list->cmp : strcmp;
- QSORT(list->items, list->nr, cmp_items);
+ QSORT_S(list->items, list->nr, cmp_items,
+ list->cmp ? list->cmp : strcmp);
}
struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
--
2.11.0
prev parent reply other threads:[~2016-12-01 16:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 16:24 [PATCH 0/3] string-list: make string_list_sort() reentrant René Scharfe
2016-12-01 16:26 ` [PATCH 1/3] compat: add qsort_s() René Scharfe
2016-12-01 16:31 ` René Scharfe
2016-12-01 19:35 ` Jeff King
2016-12-01 20:14 ` Junio C Hamano
2016-12-01 20:19 ` Jeff King
2016-12-01 20:25 ` Junio C Hamano
2016-12-01 22:30 ` René Scharfe
2016-12-01 23:37 ` Junio C Hamano
2016-12-01 20:22 ` Junio C Hamano
2016-12-01 20:26 ` Jeff King
2016-12-12 19:51 ` René Scharfe
2016-12-12 19:57 ` Jeff King
2016-12-21 9:36 ` René Scharfe
2016-12-01 16:28 ` [PATCH 2/3] add QSORT_S René Scharfe
2016-12-01 16:29 ` René Scharfe [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=adc18b5e-21f5-2a5f-b788-1181a8d56d3c@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).