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
Fix PyInterpreterState_GetID().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 22, 2017
commit d8150d40e346d151e4217c15f9c541089d1cf84a
4 changes: 2 additions & 2 deletions Doc/c-api/init.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,10 +821,10 @@ been created.
:c:func:`PyThreadState_Clear`.


.. c:function:: unsigned long PyInterpreterState_GetID(PyInterpreterState *interp)
.. c:function:: int_fast64_t PyInterpreterState_GetID(PyInterpreterState *interp)

Return the interpreter's unique ID. If there was any error in doing
so then 0 is returned and an error is set.
so then -1 is returned and an error is set.

.. versionadded:: 3.7

Expand Down
2 changes: 1 addition & 1 deletion Include/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ PyAPI_FUNC(void) _PyInterpreterState_Init(void);
PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void);
PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *);
PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
PyAPI_FUNC(unsigned long) PyInterpreterState_GetID(PyInterpreterState *);
PyAPI_FUNC(int_fast64_t) PyInterpreterState_GetID(PyInterpreterState *);
#ifndef Py_LIMITED_API
PyAPI_FUNC(int) _PyState_AddModule(PyObject*, struct PyModuleDef*);
#endif /* !Py_LIMITED_API */
Expand Down
2 changes: 1 addition & 1 deletion Programs/_testembed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static void print_subinterp(void)
/* Output information about the interpreter in the format
expected in Lib/test/test_capi.py (test_subinterps). */
PyThreadState *ts = PyThreadState_Get();
unsigned long id = PyInterpreterState_GetID(ts->interp);
int_fast64_t id = PyInterpreterState_GetID(ts->interp);
printf("interp %lu <%p>, thread state <%p>: ",
id, ts->interp, ts);
fflush(stdout);
Expand Down
4 changes: 2 additions & 2 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,12 @@ PyInterpreterState_Delete(PyInterpreterState *interp)
}


unsigned long
int_fast64_t
PyInterpreterState_GetID(PyInterpreterState *interp)
{
if (interp == NULL) {
PyErr_SetString(PyExc_RuntimeError, "no interpreter provided");
return 0;
return -1;
}
return interp->id;
}
Expand Down