[Python-checkins] r84927 - in python/branches/py3k: Misc/NEWS Python/pythonrun.c
antoine.pitrou
python-checkins at python.org
Mon Sep 20 22:13:48 CEST 2010
Author: antoine.pitrou
Date: Mon Sep 20 22:13:48 2010
New Revision: 84927
Log:
Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other
threads are still running. Instead, reinitialize the GIL on a second
call to Py_Initialize().
Modified:
python/branches/py3k/Misc/NEWS
python/branches/py3k/Python/pythonrun.c
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Mon Sep 20 22:13:48 2010
@@ -10,6 +10,10 @@
Core and Builtins
-----------------
+- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other
+ threads are still running. Instead, reinitialize the GIL on a second
+ call to Py_Initialize().
+
- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the
module that was imported, but instead gets the module from sys.modules.
Modified: python/branches/py3k/Python/pythonrun.c
==============================================================================
--- python/branches/py3k/Python/pythonrun.c (original)
+++ python/branches/py3k/Python/pythonrun.c Mon Sep 20 22:13:48 2010
@@ -217,8 +217,15 @@
Py_FatalError("Py_Initialize: can't make first thread");
(void) PyThreadState_Swap(tstate);
- /* auto-thread-state API, if available */
#ifdef WITH_THREAD
+ /* We can't call _PyEval_FiniThreads() in Py_Finalize because
+ destroying the GIL might fail when it is being referenced from
+ another running thread (see issue #9901).
+ Instead we destroy the previously created GIL here, which ensures
+ that we can call Py_Initialize / Py_Finalize multiple times. */
+ _PyEval_FiniThreads();
+
+ /* Auto-thread-state API */
_PyGILState_Init(interp, tstate);
#endif /* WITH_THREAD */
@@ -514,10 +521,6 @@
PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
-#ifdef WITH_THREAD
- _PyEval_FiniThreads();
-#endif
-
#ifdef Py_TRACE_REFS
/* Display addresses (& refcnts) of all objects still alive.
* An address can be used to find the repr of the object, printed
More information about the Python-checkins
mailing list