refactor: access ThreadContext through CurrentThread(), ci: switch Bitcoin Core to master - #323
Merged
Merged
Conversation
Introduce CurrentThread() as an accessor for the existing namespace-scope thread_local object and migrate internal callers to it. This does not change storage duration, initialization, destruction, the exported TLS symbol, or its lint suppressions. Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ReviewsSee the guideline and AI policy for information on the review process.
If your review is incorrectly listed, please copy-paste |
bitcoin/bitcoin#35084 has now been merged.
Sjors
changed the title
hebasto
approved these changes
Jul 29, 2026
Contributor
|
ACK 66298c7 |
ryanofsky
approved these changes
Jul 30, 2026
ryanofsky
left a comment
ryanofsky
left a comment
Collaborator
There was a problem hiding this comment.
Code review ACK 66298c7. This nicely separates the CurrentThread refactoring from the mingw bug workaround. But it's misleading to call this a minimal fix for compatibility, because a minimal fix would just be:
--- a/include/mp/proxy-io.h
+++ b/include/mp/proxy-io.h
@@ -934,6 +934,10 @@ extern thread_local ThreadContext g_thread_context; // NOLINT(bitcoin-nontrivial
// cannot be thread_local" which should not be a problem on modern platforms, and
// could lead to a small memory leak at worst on older ones.
+inline ThreadContext& CurrentThread()
+{
+ return g_thread_context;
+}
} // namespace mp
#endif // MP_PROXY_IO_H
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
This is a minimal subset from #318 needed to match the shim introduced by bitcoin/bitcoin#35084. Should unblock #322, see #322 (comment).
Include #322 here, because CI will not pass now since bitcoin/bitcoin#35084 merged.