Skip to content

gh-76785: Improved Subinterpreters Compatibility with 3.12 (2/2) #126707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 6 commits into from
Nov 12, 2024
Merged

gh-76785: Improved Subinterpreters Compatibility with 3.12 (2/2) #126707

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45ace42
Move _PyXI_GET_STATE() to the API.
ericsnowcurrently Nov 5, 2024
89230fb
Check the result of _PyXI_GET_STATE().
ericsnowcurrently Nov 7, 2024
ecb2d45
Add _PyXIData_lookup_context_t.
ericsnowcurrently Nov 5, 2024
ad7cd0d
Add state init/fini funcs.
ericsnowcurrently Nov 5, 2024
cf48016
Use the init funcs in _PyXI_Init().
ericsnowcurrently Nov 7, 2024
9b13684
lint
ericsnowcurrently Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Move _PyXI_GET_STATE() to the API.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 11, 2024
commit 45ace429a2e85a081a455c10fea83ce059fc4cbc
5 changes: 3 additions & 2 deletions Include/internal/pycore_crossinterp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,14 @@ typedef struct {
} exceptions;
} _PyXI_state_t;

#define _PyXI_GET_GLOBAL_STATE(interp) (&(interp)->runtime->xi)
#define _PyXI_GET_STATE(interp) (&(interp)->xi)

extern PyStatus _PyXI_Init(PyInterpreterState *interp);
extern void _PyXI_Fini(PyInterpreterState *interp);
extern PyStatus _PyXI_InitTypes(PyInterpreterState *interp);
extern void _PyXI_FiniTypes(PyInterpreterState *interp);

#define _PyInterpreterState_GetXIState(interp) (&(interp)->xi)


/***************************/
/* short-term data sharing */
Expand Down
2 changes: 1 addition & 1 deletion Modules/_interpretersmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ module_exec(PyObject *mod)
goto error;
}
PyObject *PyExc_NotShareableError = \
_PyInterpreterState_GetXIState(interp)->exceptions.PyExc_NotShareableError;
_PyXI_GET_STATE(interp)->exceptions.PyExc_NotShareableError;
if (PyModule_AddType(mod, (PyTypeObject *)PyExc_NotShareableError) < 0) {
goto error;
}
Expand Down
4 changes: 0 additions & 4 deletions Python/crossinterp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
#include "pycore_pyerrors.h" // _PyErr_Clear()


#define _PyXI_GET_GLOBAL_STATE(interp) (&(interp)->runtime->xi)
#define _PyXI_GET_STATE(interp) (&(interp)->xi)


/**************/
/* exceptions */
/**************/
Expand Down