This is a minimal subset from #318 needed to match the shim introduced by https://github.com/bitcoin/bitcoin/pull/35084. Should unblock #322, see #322 (comment).
Include #322 here, because CI will not pass now since https://github.com/bitcoin/bitcoin/pull/35084 merged.
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>
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline and AI policy for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | hebasto, xyzconstant, ViniciusCestarii, ryanofsky |
If your review is incorrectly listed, please copy-paste <code><!--meta-tag:bot-skip--></code> into the comment that the bot should ignore.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
bitcoin/bitcoin#35084 has now been merged.
ACK 66298c737f43b12009e25396383aeb98b6c8164b.
ACK 66298c737f43b12009e25396383aeb98b6c8164b
ACK 66298c737f43b12009e25396383aeb98b6c8164b
Code review ACK 66298c737f43b12009e25396383aeb98b6c8164b. 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