summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-13 00:46:43 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-12-13 00:46:43 (GMT)
commit62ca10051b5aa07b86807a50674dbef4cace22f7 (patch)
treea44e3375e425b589df8b8131f1c7f4b05b1979d8
parent56668dc187d9b77b76c8906a8e23198314aec18a (diff)
downloadcpython-62ca10051b5aa07b86807a50674dbef4cace22f7.zip
cpython-62ca10051b5aa07b86807a50674dbef4cace22f7.tar.gz
cpython-62ca10051b5aa07b86807a50674dbef4cace22f7.tar.bz2
Close #19576: PyGILState_Ensure() now initializes threads. At startup, Python
has no concrete GIL. If PyGILState_Ensure() is called from a new thread for the first time and PyEval_InitThreads() was not called yet, a GIL needs to be created.
-rw-r--r--Misc/NEWS5
-rw-r--r--Python/pystate.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2c1df09..84f36b8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,11 @@ Release date: 2014-01-05
Core and Builtins
-----------------
+- Issue #19576: PyGILState_Ensure() now initializes threads. At startup, Python
+ has no concrete GIL. If PyGILState_Ensure() is called from a new thread for
+ the first time and PyEval_InitThreads() was not called yet, a GIL needs to be
+ created.
+
- Issue #17576: Deprecation warning emitted now when __int__() or __index__()
return not int instance.
diff --git a/Python/pystate.c b/Python/pystate.c
index 6be71de..a56e308 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -771,6 +771,11 @@ PyGILState_Ensure(void)
assert(autoInterpreterState); /* Py_Initialize() hasn't been called! */
tcur = (PyThreadState *)PyThread_get_key_value(autoTLSkey);
if (tcur == NULL) {
+ /* At startup, Python has no concrete GIL. If PyGILState_Ensure() is
+ called from a new thread for the first time, we need the create the
+ GIL. */
+ PyEval_InitThreads();
+
/* Create a new thread state for this thread */
tcur = PyThreadState_New(autoInterpreterState);
if (tcur == NULL)