Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 84623 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84623 | antoine.pitrou | 2010-09-08 14:37:10 +0200 (mer., 08 sept. 2010) | 4 lines

  Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
  thread-local storage key.
........
This commit is contained in:
Antoine Pitrou 2010-09-08 12:40:49 +00:00
parent a240cb1f2d
commit 0a7b65b7da
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -12,6 +12,9 @@ What's New in Python 2.7.1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
thread-local storage key.
- Issue #4947: The write() method of sys.stdout and sys.stderr uses their - Issue #4947: The write() method of sys.stdout and sys.stderr uses their
encoding and errors attributes instead of using utf-8 in strict mode, to get encoding and errors attributes instead of using utf-8 in strict mode, to get
the same behaviour than the print statement. the same behaviour than the print statement.

15
Python/pystate.c
View File

@ -298,7 +298,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 */
} }
@ -314,7 +314,7 @@ PyThreadState_DeleteCurrent()
"PyThreadState_DeleteCurrent: no current tstate"); "PyThreadState_DeleteCurrent: no current tstate");
_PyThreadState_Current = NULL; _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();
} }
@ -534,7 +534,6 @@ void
_PyGILState_Fini(void) _PyGILState_Fini(void)
{ {
PyThread_delete_key(autoTLSkey); PyThread_delete_key(autoTLSkey);
autoTLSkey = 0;
autoInterpreterState = NULL; autoInterpreterState = NULL;
} }
@ -546,10 +545,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.
@ -577,7 +576,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);
} }