From 412f2460248b21e8d09a57afe98cdb33c16025bc Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Sat, 2 Sep 2000 09:16:15 +0000 Subject: [PATCH] PyInterpreterState_New is not thread-safe, and the recent fix to _PyPclose can cause it to get called by multiple threads simultaneously. Ditto for PyInterpreterState_Delete. Of the former, the docs say "The interpreter lock need not be held, but may be held if it is necessary to serialize calls to this function". This kinda implies it both is and isn't thread-safe. Of the latter, the docs merely say "The interpreter lock need not be held.", and the clause about serializing is absent. I expect it was *believed* these are both thread-safe, and the bit about serializing via the global lock was meant as a permission rather than a caution. I also expect we've never seen a problem here because the Python core (prior to the _PyPclose fix) only calls these functions once per run. The Py_NewInterpreter subsystem exposed by the C API (but not used by Python itself) also calls them, but that subsystem appears to be very rarely used. Whatever, they're both thread-safe now. --- Python/pystate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Python/pystate.c b/Python/pystate.c index 85a9ce7604..0651ab016f 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -40,8 +40,10 @@ PyInterpreterState_New(void) interp->checkinterval = 10; interp->tstate_head = NULL; + HEAD_LOCK(); interp->next = interp_head; interp_head = interp; + HEAD_UNLOCK(); } return interp; @@ -79,6 +81,7 @@ PyInterpreterState_Delete(PyInterpreterState *interp) { PyInterpreterState **p; zapthreads(interp); + HEAD_LOCK(); for (p = &interp_head; ; p = &(*p)->next) { if (*p == NULL) Py_FatalError( @@ -89,6 +92,7 @@ PyInterpreterState_Delete(PyInterpreterState *interp) if (interp->tstate_head != NULL) Py_FatalError("PyInterpreterState_Delete: remaining threads"); *p = interp->next; + HEAD_UNLOCK(); PyMem_DEL(interp); } -- 2.49.0