Skip to content

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

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 8 commits into from
Nov 11, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c09639
Fix parking lot.
ericsnowcurrently Nov 5, 2024
6972d0b
xid_newobjectfunc -> xid_newobjfunc
ericsnowcurrently Nov 5, 2024
e4c64ad
_xid -> _xidata
ericsnowcurrently Nov 5, 2024
8ff613c
struct _xidregitem -> _PyXIData_regitem_t
ericsnowcurrently Nov 5, 2024
bca218a
struct _xidregistry -> _PyXIData_registry_t
ericsnowcurrently Nov 5, 2024
0239667
struct _xi_runtime_state -> _PyXI_global_state_t
ericsnowcurrently Nov 5, 2024
8f29d80
struct _xi_state -> _PyXI_state_t
ericsnowcurrently Nov 5, 2024
de75cb4
Use struct _xi_state to look up PyExc_NotShareableError.
ericsnowcurrently Nov 5, 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
Prev Previous commit
Next Next commit
struct _xi_state -> _PyXI_state_t
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 11, 2024
commit 8f29d80a94515f598ab4d6f9e90917ebf0995d23
4 changes: 2 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 @@ -160,7 +160,7 @@ typedef struct {
_PyXIData_lookup_t data_lookup;
} _PyXI_global_state_t;

struct _xi_state {
typedef struct {
// heap types
_PyXIData_lookup_t data_lookup;

Expand All @@ -171,7 +171,7 @@ struct _xi_state {
// heap types
PyObject *PyExc_NotShareableError;
} exceptions;
};
} _PyXI_state_t;

extern PyStatus _PyXI_Init(PyInterpreterState *interp);
extern void _PyXI_Fini(PyInterpreterState *interp);
Expand Down
4 changes: 2 additions & 2 deletions Include/internal/pycore_interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extern "C" {
#include "pycore_code.h" // struct callable_cache
#include "pycore_codecs.h" // struct codecs_state
#include "pycore_context.h" // struct _Py_context_state
#include "pycore_crossinterp.h" // struct _xi_state
#include "pycore_crossinterp.h" // _PyXI_state_t
#include "pycore_dict_state.h" // struct _Py_dict_state
#include "pycore_dtoa.h" // struct _dtoa_state
#include "pycore_exceptions.h" // struct _Py_exc_state
Expand Down Expand Up @@ -205,7 +205,7 @@ struct _is {
freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS];

/* cross-interpreter data and utils */
struct _xi_state xi;
_PyXI_state_t xi;

#ifdef HAVE_FORK
PyObject *before_forkers;
Expand Down