fix: modify the internals pointer-to-pointer implementation to not use thread_local
#5709
Conversation
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
|
I'll try to get #5705, rebase this and add a comment the removes the subinterp disable define. That should also trigger the full CI. I think we do need an internals bump just in case people built with the old RC. @rwgk might also bump the internals once more for the reworking he proposed in #5700 (maybe next weekend?). |
henryiii
force-pushed
the
subinterpreter-in-tss
branch
from
dd73712 to
cb9227a
Compare
rwgk
reviewed
Jun 2, 2025
There was a problem hiding this comment.
A couple comments.
I don't have the free bandwidth at the moment to fully review this. I only scrolled through and stopped here and there. I like what I'm seeing!
@henryiii please go ahead and merge this if it looks good to you. (Assuming you're bumping the internals version.)
Should now just be able to delete the internals PP on destruction
Also fix a couple more pedantic warings
So instead, just make sure it was zero'd and don't try to compare the addresses. Also a little code cleanup
b-pass
force-pushed
the
subinterpreter-in-tss
branch
from
cb9227a to
20f3606
Compare
Signed-off-by: Henry Schreiner <[email protected]>
henryiii
changed the title
thread_localthread_local
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.
Description
As mentioned in #5705, there are a couple platforms that don't support C++11's
thread_localkeyword but they do still support Python's thread-specific-storage.So this implementation restructures the part of sub-interpreter support that was using thread_local to instead use CPython's TSS.
To make this a little easier I added a wrapper class around the PYBIND11_TLS_* macros. This makes accessing them feel a lot more like accessing a pointer, and puts their allocation and release into RAII.
I also changed the
internalsuse of PYBIND11_TLS (tstateandloader_life_support_tls_keymembers) to use the new wrapper. This was not strictly required to address the goal of the PR, but it makes sense to do this since there is a wrapper for it now.NOTE: This should probably increment the internals ABI number, but since that was already changed for RC1, I didn't change it in this PR. Should it be changed?
Suggested changelog entry:
thread_local(better iOS support)