mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid

Browse source 
thread-local storage key.
This commit is contained in:
Antoine Pitrou 2010-09-08 12:37:10 +00:00
parent 121a1c4e11
commit 079ce54efe
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ What's New in Python 3.2 Alpha 3?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
thread-local storage key.
Library Library
------- -------

15
Python/pystate.c
View file

@ -340,7 +340,7 @@ PyThreadState_Delete(PyThreadState *tstate)
Py_FatalError("PyThreadState_Delete: tstate is still current"); Py_FatalError("PyThreadState_Delete: tstate is still current");
tstate_delete_common(tstate); tstate_delete_common(tstate);
#ifdef WITH_THREAD #ifdef WITH_THREAD
if (autoTLSkey && PyThread_get_key_value(autoTLSkey) == tstate) if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
PyThread_delete_key_value(autoTLSkey); PyThread_delete_key_value(autoTLSkey);
#endif /* WITH_THREAD */ #endif /* WITH_THREAD */
} }
@ -357,7 +357,7 @@ PyThreadState_DeleteCurrent()
"PyThreadState_DeleteCurrent: no current tstate"); "PyThreadState_DeleteCurrent: no current tstate");
_Py_atomic_store_relaxed(&_PyThreadState_Current, NULL); _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL);
tstate_delete_common(tstate); 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); PyThread_delete_key_value(autoTLSkey);
PyEval_ReleaseLock(); PyEval_ReleaseLock();
} }
@ -580,7 +580,6 @@ void
_PyGILState_Fini(void) _PyGILState_Fini(void)
{ {
PyThread_delete_key(autoTLSkey); PyThread_delete_key(autoTLSkey);
autoTLSkey = 0;
autoInterpreterState = NULL; autoInterpreterState = NULL;
} }
@ -592,10 +591,10 @@ _PyGILState_Fini(void)
static void static void
_PyGILState_NoteThreadState(PyThreadState* tstate) _PyGILState_NoteThreadState(PyThreadState* tstate)
{ {
/* If autoTLSkey is 0, this must be the very first threadstate created /* If autoTLSkey isn't initialized, this must be the very first
in Py_Initialize(). Don't do anything for now (we'll be back here threadstate created in Py_Initialize(). Don't do anything for now
when _PyGILState_Init is called). */ (we'll be back here when _PyGILState_Init is called). */
if (!autoTLSkey) if (!autoInterpreterState)
return; return;
/* Stick the thread state for this thread in thread local storage. /* Stick the thread state for this thread in thread local storage.
@ -623,7 +622,7 @@ _PyGILState_NoteThreadState(PyThreadState* tstate)
PyThreadState * PyThreadState *
PyGILState_GetThisThreadState(void) PyGILState_GetThisThreadState(void)
{ {
if (autoInterpreterState == NULL || autoTLSkey == 0) if (autoInterpreterState == NULL)
return NULL; return NULL;
return (PyThreadState *)PyThread_get_key_value(autoTLSkey); return (PyThreadState *)PyThread_get_key_value(autoTLSkey);
} }