Mercurial > cpython-lru_cache-weakref
diff Python/pystate.c @ 64558:851672498fe5
Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
thread-local storage key.
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Wed, 08 Sep 2010 12:37:10 +0000 |
| parents | cab14be0ada1 |
| children | 8e428b8e7d81 |
line wrap: on
line diff
--- a/Python/pystate.c Wed Sep 08 10:46:15 2010 +0000 +++ b/Python/pystate.c Wed Sep 08 12:37:10 2010 +0000 @@ -340,7 +340,7 @@ Py_FatalError("PyThreadState_Delete: tstate is still current"); tstate_delete_common(tstate); #ifdef WITH_THREAD - if (autoTLSkey && PyThread_get_key_value(autoTLSkey) == tstate) + if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate) PyThread_delete_key_value(autoTLSkey); #endif /* WITH_THREAD */ } @@ -357,7 +357,7 @@ "PyThreadState_DeleteCurrent: no current tstate"); _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL); tstate_delete_common(tstate); - if (autoTLSkey && PyThread_get_key_value(autoTLSkey) == tstate) + if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate) PyThread_delete_key_value(autoTLSkey); PyEval_ReleaseLock(); } @@ -580,7 +580,6 @@ _PyGILState_Fini(void) { PyThread_delete_key(autoTLSkey); - autoTLSkey = 0; autoInterpreterState = NULL; } @@ -592,10 +591,10 @@ static void _PyGILState_NoteThreadState(PyThreadState* tstate) { - /* If autoTLSkey is 0, this must be the very first threadstate created - in Py_Initialize(). Don't do anything for now (we'll be back here - when _PyGILState_Init is called). */ - if (!autoTLSkey) + /* If autoTLSkey isn't initialized, this must be the very first + threadstate created in Py_Initialize(). Don't do anything for now + (we'll be back here when _PyGILState_Init is called). */ + if (!autoInterpreterState) return; /* Stick the thread state for this thread in thread local storage. @@ -623,7 +622,7 @@ PyThreadState * PyGILState_GetThisThreadState(void) { - if (autoInterpreterState == NULL || autoTLSkey == 0) + if (autoInterpreterState == NULL) return NULL; return (PyThreadState *)PyThread_get_key_value(autoTLSkey); }