fix #4312 - musl compilation compatibility #4336
Merged
+67
−36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cyan4973
changed the title
|
And indeed, it helps a bit: |
Cyan4973
changed the title
and upgraded the test so that it would fail, both at compile time and at run time, without the fix
centralizes auto detection tests, then distribute the outcome in all the places where it's active.
standard defined re-entrant variant of qsort(). Unfortunately, Annex K is optional.
terrelln
approved these changes
Mar 12, 2025
lib/dictBuilder/cover.c
Outdated
Comment on lines
369
to
371
| * Note(@cyan): qsort() is never guaranteed to be stable, | ||
| * so why would this property only matter for OpenBSD ? | ||
| */ |
There was a problem hiding this comment.
I think we can drop this. This was added before we switched to use COVER_strict_cmp* which enforces a strict ordering on the array.
|
g_coverCtx can be declared as thread local so this code will at least be thread-safe on older versions of musl |
|
In |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#4312 tried to implement a manual workaround for
muslcompilation issues.It's manual because
musldoes not provide a version number, making it difficult to automate decisions.Unfortunately, the fix was incomplete, and the test did not catch it because it only detected a "warning" and had no runtime error.
Fixed both the test, which will now fail both at run time and compile time under similar conditions,
and the code, which now passes the more stringent test.
Used the opportunity to restructure the code, so that the dispatch strategy among the different variants of
qsort*()is more maintainable and extendable.Employed the new framework to add support for
C11Annex Kqsort_s()re-entrant variant.also:
Reduced the duration of long CLI tests, particularly dictionary building tests, by utilizing multithreading with the
-T0flag. This optimization significantly decreases the execution time of the longest CI jobs, enhancing overall CI efficiency and throughput.