Skip to content

bpo-29102: Add a unique ID to PyInterpreterState. #1639

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 17 commits into from
May 23, 2017
Merged

bpo-29102: Add a unique ID to PyInterpreterState. #1639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b57de67
Add a unique ID to each interpreter.
ericsnowcurrently Dec 14, 2016
160c90e
Reset _next_id to 1 in each Py_Initialize() call.
ericsnowcurrently Dec 30, 2016
3948bf2
Drop a TODO.
ericsnowcurrently Dec 30, 2016
5caac3d
Use int_fast64_t for the interpreter ID.
ericsnowcurrently Dec 31, 2016
6c6a6c5
_PyInterpreterState_next_id -> _PyInterpreterState_Init().
ericsnowcurrently Dec 31, 2016
e335edd
Fix an outdated comment.
ericsnowcurrently Dec 31, 2016
d8150d4
Fix PyInterpreterState_GetID().
ericsnowcurrently Dec 31, 2016
9a14e01
Drop an ununsed variable.
ericsnowcurrently Dec 31, 2016
67cb77e
int_fast64_t -> PY_INT64_T.
ericsnowcurrently Dec 31, 2016
0f36bcc
Use int64_t directly.
ericsnowcurrently May 17, 2017
808aff4
Not all platforms show a 0x prefix for memory addresses.
ericsnowcurrently May 18, 2017
cb81226
Dereference the interp pointer before calling printf().
ericsnowcurrently May 19, 2017
3061a40
Use inttypes.h to format pointer addresses.
ericsnowcurrently May 19, 2017
14d74f9
Skip some problematic (new) checks on Windows in a test.
ericsnowcurrently May 20, 2017
4797749
Add a news entry.
ericsnowcurrently May 22, 2017
c12e228
Only add the limited API in 3.7+.
ericsnowcurrently May 23, 2017
85dbed7
Add PyInterpreterState_GetID() to the stable API on Windows.
ericsnowcurrently May 23, 2017
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
Use int_fast64_t for the interpreter ID.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 22, 2017
commit 5caac3dcbd74d99c3ca558e304ce816d4c77019a
18 changes: 8 additions & 10 deletions Include/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,28 @@ removed (with effort). */

/* State shared between threads */

#ifndef Py_LIMITED_API
/* This is initialized to 1 in Py_Initialize(). An interpreter
ID of 0 is reserved for errors. The main interpreter will always
have an ID of 1. Overflow results in a RuntimeError. If that
becomes a problem later then we can adjust, e.g. by using a 64-bit
int or even a Python int. */
PyAPI_DATA(unsigned long) _PyInterpreterState_next_id;
#endif

struct _ts; /* Forward */
struct _is; /* Forward */
struct _frame; /* Forward declaration for PyFrameObject. */

#ifdef Py_LIMITED_API
typedef struct _is PyInterpreterState;
#else
/* This is initialized to 0 in Py_Initialize(). A negative interpreter
ID indicates an error occurred. The main interpreter will always
have an ID of 0. Overflow results in a RuntimeError. If that
becomes a problem later then we can adjust, e.g. by using a Python
int. */
PyAPI_DATA(int_fast64_t) _PyInterpreterState_next_id;

typedef PyObject* (*_PyFrameEvalFunction)(struct _frame *, int);

typedef struct _is {

struct _is *next;
struct _ts *tstate_head;

unsigned long id;
int_fast64_t id;

PyObject *modules;
PyObject *modules_by_index;
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_capi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ def test_subinterps(self):
print(line)
lastmain = main
main = None
mainid = 1
mainid = 0
numloops += 1
numinner = 0
continue
Expand Down
2 changes: 1 addition & 1 deletion Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib)

_PyRandom_Init();

_PyInterpreterState_next_id = 1;
_PyInterpreterState_next_id = 0;
interp = PyInterpreterState_New();
if (interp == NULL)
Py_FatalError("Py_Initialize: can't make first interpreter");
Expand Down
6 changes: 3 additions & 3 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ static void _PyGILState_NoteThreadState(PyThreadState* tstate);
#endif


/* We initialize this to 0 so that the pre-Py_Initialize() value
/* We initialize this to -1 so that the pre-Py_Initialize() value
results in an error. */
unsigned long _PyInterpreterState_next_id = 0;
int_fast64_t _PyInterpreterState_next_id = -1;

PyInterpreterState *
PyInterpreterState_New(void)
Expand Down Expand Up @@ -107,7 +107,7 @@ PyInterpreterState_New(void)
HEAD_LOCK();
interp->next = interp_head;
interp_head = interp;
if (_PyInterpreterState_next_id == 0) {
if (_PyInterpreterState_next_id < 0) {
/* overflow or Py_Initialize() not called! */
PyErr_SetString(PyExc_RuntimeError,
"failed to get an interpreter ID");
Expand Down