From: Charles-François Natali <neologix@free.fr>
Date: Sun, 26 Feb 2012 16:27:32 +0000 (+0100)
Subject: Issue #14107: test: Fix a deadlock involving the memory watchdog thread.
X-Git-Tag: v3.3.0a1~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9578757ec4892cfdad29a748f88344f65aa2efbb;p=python

Issue #14107: test: Fix a deadlock involving the memory watchdog thread.
---

diff --git a/Lib/test/support.py b/Lib/test/support.py
index 47b94ca26f..c384222024 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -45,6 +45,11 @@ try:
 except ImportError:
     zlib = None
 
+try:
+    import fcntl
+except ImportError:
+    fcntl = None
+
 __all__ = [
     "Error", "TestFailed", "ResourceDenied", "import_module",
     "verbose", "use_resources", "max_memuse", "record_original_stdout",
@@ -1184,6 +1189,11 @@ class _MemoryWatchdog:
             sys.stderr.flush()
             return
         pipe_fd, wfd = os.pipe()
+        # set the write end of the pipe non-blocking to avoid blocking the
+        # watchdog thread when the consumer doesn't drain the pipe fast enough
+        if fcntl:
+            flags = fcntl.fcntl(wfd, fcntl.F_GETFL)
+            fcntl.fcntl(wfd, fcntl.F_SETFL, flags|os.O_NONBLOCK)
         # _file_watchdog() doesn't take the GIL in its child thread, and
         # therefore collects statistics timely
         faulthandler._file_watchdog(rfd, wfd, 1.0)