Nov 16, 2022 · Nov 11, 2022 · Nov 11, 2022 · Nov 15, 2022 · Nov 15, 2022 · Nov 15, 2022
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
   The global interpreter lock need not be held, but may be held if it is
   necessary to serialize calls to this function.

   .. audit-event:: cpython.PyThreadState_New"" c.PyThreadState_New
   .. audit-event:: cpython.PyThreadState_Newid c.PyThreadState_New

      Raise an auditing event ``cpython.PyThreadState_New`` with no arguments.
      The event will be raised from the creating thread, not the new thread.
      Raise an auditing event ``cpython.PyThreadState_New`` with Python's thread
      id as the argument. The event will be raised from the thread creating the new
      ``PyThreadState``, which may not be the new thread.


 .. c:function:: void PyThreadState_Clear(PyThreadState *tstate)

   Reset all information in a thread state object.  The global interpreter lock
   must be held.

   .. audit-event:: cpython.PyThreadState_Clear"" c.PyThreadState_Clear
   .. audit-event:: cpython.PyThreadState_Clearid c.PyThreadState_Clear

      Raise an auditing event ``cpython.PyThreadState_Clear`` withno arguments.
      The event may be raised from a different thread than the one being
      cleared. Exceptions raised from a hook will be treated as unraisable and
      will not abort the operation.
      Raise an auditing event ``cpython.PyThreadState_Clear`` withPython's
 thread id as the argument.The event may be raised from a different thread
 than the one beingcleared. Exceptions raised from a hook will be treated
 as unraisable andwill not abort the operation.

   .. versionchanged:: 3.9
      This function now calls the :c:member:`PyThreadState.on_delete` callback.
diff --git a/Python/pystate.c b/Python/pystate.c
    PyThreadState *tstate;
    _PyRuntimeState *runtime = interp->runtime;

    PyThreadState *ts = _PyThreadState_GET();
    if (ts && _PySys_Audit(ts, "cpython.PyThreadState_New", NULL) < 0) {
        return NULL;
    }

    // We don't need to allocate a thread state for the main interpreter
    // (the common case), but doing it later for the other case revealed a
    // reentrancy problem (deadlock).  So for now we always allocate before
    PyThreadState *tstate = new_threadstate(interp);
    if (tstate) {
        _PyThreadState_SetCurrent(tstate);
        if (PySys_Audit("cpython.PyThreadState_New", "K", tstate->id) < 0) {
            PyThreadState_Clear(tstate);
            _PyThreadState_DeleteCurrent(tstate);
            return NULL;
        }
    }
    return tstate;
 }

 PyThreadState *
 _PyThreadState_Prealloc(PyInterpreterState *interp)
 {
    return new_threadstate(interp);
    PyThreadState *tstate = new_threadstate(interp);
    if (tstate) {
        if (PySys_Audit("cpython.PyThreadState_New", "K", tstate->id) < 0) {
            PyThreadState_Clear(tstate);
            _PyThreadState_DeleteCurrent(tstate);
            return NULL;
        }
    }
    return tstate;
 }

 // We keep this around for (accidental) stable ABI compatibility.
 void
 PyThreadState_Clear(PyThreadState *tstate)
 {
    if (PySys_Audit("cpython.PyThreadState_Clear",NULL) < 0) {
    if (PySys_Audit("cpython.PyThreadState_Clear","K", tstate->id) < 0) {
        PyErr_WriteUnraisable(NULL);
    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1239,23 +1239,24 @@ All of the following functions must be called after :c:func:`Py_Initialize`.
		The global interpreter lock need not be held, but may be held if it is
		necessary to serialize calls to this function.

		.. audit-event:: cpython.PyThreadState_New"" c.PyThreadState_New
		.. audit-event:: cpython.PyThreadState_Newid c.PyThreadState_New

		Raise an auditing event ``cpython.PyThreadState_New`` with no arguments.
		The event will be raised from the creating thread, not the new thread.
		Raise an auditing event ``cpython.PyThreadState_New`` with Python's thread
		id as the argument. The event will be raised from the thread creating the new
		``PyThreadState``, which may not be the new thread.


		.. c:function:: void PyThreadState_Clear(PyThreadState *tstate)

		Reset all information in a thread state object. The global interpreter lock
		must be held.

		.. audit-event:: cpython.PyThreadState_Clear"" c.PyThreadState_Clear
		.. audit-event:: cpython.PyThreadState_Clearid c.PyThreadState_Clear

		Raise an auditing event ``cpython.PyThreadState_Clear`` withno arguments.
		The event may be raised from a different thread than the one being
		cleared. Exceptions raised from a hook will be treated as unraisable and
		will not abort the operation.
		Raise an auditing event ``cpython.PyThreadState_Clear`` withPython's
		thread id as the argument.The event may be raised from a different thread
		than the one beingcleared. Exceptions raised from a hook will be treated
		as unraisable andwill not abort the operation.

		.. versionchanged:: 3.9
		This function now calls the :c:member:`PyThreadState.on_delete` callback.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -821,11 +821,6 @@ new_threadstate(PyInterpreterState *interp)
		PyThreadState *tstate;
		_PyRuntimeState *runtime = interp->runtime;

		PyThreadState *ts = _PyThreadState_GET();
		if (ts && _PySys_Audit(ts, "cpython.PyThreadState_New", NULL) < 0) {
		return NULL;
		}

		// We don't need to allocate a thread state for the main interpreter
		// (the common case), but doing it later for the other case revealed a
		// reentrancy problem (deadlock). So for now we always allocate before
Expand DownExpand Up		@@ -883,14 +878,27 @@ PyThreadState_New(PyInterpreterState *interp)
		PyThreadState *tstate = new_threadstate(interp);
		if (tstate) {
		_PyThreadState_SetCurrent(tstate);
		if (PySys_Audit("cpython.PyThreadState_New", "K", tstate->id) < 0) {
		PyThreadState_Clear(tstate);
		_PyThreadState_DeleteCurrent(tstate);
		return NULL;
		}
		}
		return tstate;
		}

		PyThreadState *
		_PyThreadState_Prealloc(PyInterpreterState *interp)
		{
		return new_threadstate(interp);
		PyThreadState *tstate = new_threadstate(interp);
		if (tstate) {
		if (PySys_Audit("cpython.PyThreadState_New", "K", tstate->id) < 0) {
		PyThreadState_Clear(tstate);
		_PyThreadState_DeleteCurrent(tstate);
		return NULL;
		}
		}
		return tstate;
		}

		// We keep this around for (accidental) stable ABI compatibility.
Expand DownExpand Up		@@ -1038,7 +1046,7 @@ _PyInterpreterState_ClearModules(PyInterpreterState *interp)
		void
		PyThreadState_Clear(PyThreadState *tstate)
		{
		if (PySys_Audit("cpython.PyThreadState_Clear",NULL) < 0) {
		if (PySys_Audit("cpython.PyThreadState_Clear","K", tstate->id) < 0) {
		PyErr_WriteUnraisable(NULL);
		}

Expand Down