closes bpo-31903: Release the GIL when calling into SystemConfiguration (GH-4178)

4859ba0d · Max Bélanger · Benjamin Peterson · ec014a10 · 4859ba0d · 4859ba0d
Commit 4859ba0d authored Sep 11, 2018 by Max Bélanger Committed by Benjamin Peterson Sep 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

Misc/NEWS.d/next/macOS/2017-11-01-16-53-12.bpo-31903.K6jCVG.rst ...EWS.d/next/macOS/2017-11-01-16-53-12.bpo-31903.K6jCVG.rst +2 -0

Modules/_scproxy.c Modules/_scproxy.c +6 -0

No files found.
--- a/Misc/NEWS.d/next/macOS/2017-11-01-16-53-12.bpo-31903.K6jCVG.rst
+++ b/Misc/NEWS.d/next/macOS/2017-11-01-16-53-12.bpo-31903.K6jCVG.rst
+In :mod:`_scproxy`, drop the GIL when calling into ``SystemConfiguration`` to avoid
+deadlocks.
--- a/Modules/_scproxy.c
+++ b/Modules/_scproxy.c
@@ -62,7 +62,10 @@ get_proxy_settings(PyObject* Py_UNUSED(mod), PyObject *Py_UNUSED(ignored))
    PyObject* v;
    int r;

+    Py_BEGIN_ALLOW_THREADS
    proxyDict = SCDynamicStoreCopyProxies(NULL);
+    Py_END_ALLOW_THREADS
+
    if (!proxyDict) {
        Py_RETURN_NONE;
    }
@@ -172,7 +175,10 @@ get_proxies(PyObject* Py_UNUSED(mod), PyObject *Py_UNUSED(ignored))
    int r;
    CFDictionaryRef proxyDict = NULL;

+    Py_BEGIN_ALLOW_THREADS
    proxyDict = SCDynamicStoreCopyProxies(NULL);
+    Py_END_ALLOW_THREADS
+
    if (proxyDict == NULL) {
        return PyDict_New();
    }