diff options
| author | Joannah Nanjekye <33177550+nanjekyejoannah@users.noreply.github.com> | 2019-10-04 11:35:42 (GMT) |
|---|---|---|
| committer | Victor Stinner <vstinner@python.org> | 2019-10-04 11:35:42 (GMT) |
| commit | 8855e47d09d4db1206c65b24efc8ad0df585ac46 (patch) | |
| tree | 7bad8536eb0439d6c6edfed703b7165cb367ca0b | |
| parent | 06cb94bc8419b9a24df6b0d724fcd8e40c6971d6 (diff) | |
| download | cpython-8855e47d09d4db1206c65b24efc8ad0df585ac46.zip cpython-8855e47d09d4db1206c65b24efc8ad0df585ac46.tar.gz cpython-8855e47d09d4db1206c65b24efc8ad0df585ac46.tar.bz2 | |
bpo-38266: Revert bpo-37878: Make PyThreadState_DeleteCurrent() Internal (GH-16558)
Revert the removal of PyThreadState_DeleteCurrent() with documentation.
| -rw-r--r-- | Doc/c-api/init.rst | 8 | ||||
| -rw-r--r-- | Include/cpython/pystate.h | 1 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/C API/2019-10-03-12-53-53.bpo-38266.0FIC1q.rst | 1 | ||||
| -rw-r--r-- | Python/pystate.c | 10 |
4 files changed, 18 insertions, 2 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 0b7a84d..5456ad4 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -1035,6 +1035,14 @@ All of the following functions must be called after :c:func:`Py_Initialize`. :c:func:`PyThreadState_Clear`. + .. c:function:: void PyThreadState_DeleteCurrent() + + Destroy the current thread state and release the global interpreter lock. + Like :c:func:`PyThreadState_Delete`, the global interpreter lock need not + be held. The thread state must have been reset with a previous call + to :c:func:`PyThreadState_Clear`. + + .. c:function:: PY_INT64_T PyInterpreterState_GetID(PyInterpreterState *interp) Return the interpreter's unique ID. If there was any error in doing diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h index f872351..6c8d2ae 100644 --- a/Include/cpython/pystate.h +++ b/Include/cpython/pystate.h @@ -183,6 +183,7 @@ PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void); PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *); PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *); PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *); +PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_); diff --git a/Misc/NEWS.d/next/C API/2019-10-03-12-53-53.bpo-38266.0FIC1q.rst b/Misc/NEWS.d/next/C API/2019-10-03-12-53-53.bpo-38266.0FIC1q.rst new file mode 100644 index 0000000..3b4c423 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2019-10-03-12-53-53.bpo-38266.0FIC1q.rst @@ -0,0 +1 @@ +Revert the removal of PyThreadState_DeleteCurrent() with documentation.
\ No newline at end of file diff --git a/Python/pystate.c b/Python/pystate.c index f3d89e7..b4b1247 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -801,7 +801,7 @@ PyThreadState_Clear(PyThreadState *tstate) } -/* Common code for PyThreadState_Delete() and _PyThreadState_DeleteCurrent() */ +/* Common code for PyThreadState_Delete() and PyThreadState_DeleteCurrent() */ static void tstate_delete_common(_PyRuntimeState *runtime, PyThreadState *tstate) { @@ -857,7 +857,7 @@ _PyThreadState_DeleteCurrent(_PyRuntimeState *runtime) PyThreadState *tstate = _PyRuntimeGILState_GetThreadState(gilstate); if (tstate == NULL) Py_FatalError( - "_PyThreadState_DeleteCurrent: no current tstate"); + "PyThreadState_DeleteCurrent: no current tstate"); tstate_delete_common(runtime, tstate); if (gilstate->autoInterpreterState && PyThread_tss_get(&gilstate->autoTSSkey) == tstate) @@ -868,6 +868,12 @@ _PyThreadState_DeleteCurrent(_PyRuntimeState *runtime) PyEval_ReleaseLock(); } +void +PyThreadState_DeleteCurrent(void) +{ + _PyThreadState_DeleteCurrent(&_PyRuntime); +} + /* * Delete all thread states except the one passed as argument. |