diff options
| -rw-r--r-- | Doc/extending/newtypes.rst | 3 | ||||
| -rw-r--r-- | Lib/logging/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/subprocess.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_subprocess.py | 50 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
6 files changed, 63 insertions, 6 deletions
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst index 75836c7..2ba01bc 100644 --- a/Doc/extending/newtypes.rst +++ b/Doc/extending/newtypes.rst @@ -30,8 +30,7 @@ The Python runtime sees all Python objects as variables of type just contains the refcount and a pointer to the object's "type object". This is where the action is; the type object determines which (C) functions get called when, for instance, an attribute gets looked up on an object or it is multiplied -by another object. These C functions are called "type methods" to distinguish -them from things like ``[].append`` (which we call "object methods"). +by another object. These C functions are called "type methods". So, if you want to define a new object type, you need to create a new type object. diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 0af8bb7..de5392b 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -61,8 +61,6 @@ __date__ = "07 February 2010" # if hasattr(sys, 'frozen'): #support for py2exe _srcfile = "logging%s__init__%s" % (os.sep, __file__[-4:]) -elif __file__[-4:].lower() in ['.pyc', '.pyo']: - _srcfile = __file__[:-4] + '.py' else: _srcfile = __file__ _srcfile = os.path.normcase(_srcfile) diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 2d85b50..017f58d 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -429,12 +429,16 @@ try: except: MAXFD = 256 +# This lists holds Popen instances for which the underlying process had not +# exited at the time its __del__ method got called: those processes are wait()ed +# for synchronously from _cleanup() when a new Popen object is created, to avoid +# zombie processes. _active = [] def _cleanup(): for inst in _active[:]: res = inst._internal_poll(_deadstate=sys.maxsize) - if res is not None and res >= 0: + if res is not None: try: _active.remove(inst) except ValueError: @@ -1191,6 +1195,7 @@ class Popen(object): errread, errwrite, errpipe_read, errpipe_write, restore_signals, start_new_session, preexec_fn) + self._child_created = True else: # Pure Python implementation: It is not thread safe. # This implementation may deadlock in the child if your diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 8382c72..ff76ec4 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1394,6 +1394,56 @@ class POSIXProcessTestCase(BaseTestCase): finally: p.wait() + def test_zombie_fast_process_del(self): + # Issue #12650: on Unix, if Popen.__del__() was called before the + # process exited, it wouldn't be added to subprocess._active, and would + # remain a zombie. + # spawn a Popen, and delete its reference before it exits + p = subprocess.Popen([sys.executable, "-c", + 'import sys, time;' + 'time.sleep(0.2)'], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + self.addCleanup(p.stdout.close) + self.addCleanup(p.stderr.close) + ident = id(p) + pid = p.pid + del p + # check that p is in the active processes list + self.assertIn(ident, [id(o) for o in subprocess._active]) + + def test_leak_fast_process_del_killed(self): + # Issue #12650: on Unix, if Popen.__del__() was called before the + # process exited, and the process got killed by a signal, it would never + # be removed from subprocess._active, which triggered a FD and memory + # leak. + # spawn a Popen, delete its reference and kill it + p = subprocess.Popen([sys.executable, "-c", + 'import time;' + 'time.sleep(3)'], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + self.addCleanup(p.stdout.close) + self.addCleanup(p.stderr.close) + ident = id(p) + pid = p.pid + del p + os.kill(pid, signal.SIGKILL) + # check that p is in the active processes list + self.assertIn(ident, [id(o) for o in subprocess._active]) + + # let some time for the process to exit, and create a new Popen: this + # should trigger the wait() of p + time.sleep(0.2) + with self.assertRaises(EnvironmentError) as c: + with subprocess.Popen(['nonexisting_i_hope'], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) as proc: + pass + # p should have been wait()ed on, and removed from the _active list + self.assertRaises(OSError, os.waitpid, pid, 0) + self.assertNotIn(ident, [id(o) for o in subprocess._active]) + @unittest.skipUnless(mswindows, "Windows specific tests") class Win32ProcessTestCase(BaseTestCase): @@ -13,6 +13,11 @@ Core and Builtins - Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase titlecased and cased non-letter characters. +Library +------- + +- Issue #12650: Fix a race condition where a subprocess.Popen could leak + resources (FD/zombie) when killed at the wrong time. What's New in Python 3.2.2? =========================== diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 1f2d919..77f8dd5 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1897,7 +1897,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) size = PyBytes_GET_SIZE(output); data = PyBytes_AS_STRING(output); if (size != strlen(data)) { - PyErr_SetString(PyExc_TypeError, "embedded NULL character"); + PyErr_SetString(PyExc_TypeError, "embedded NUL character"); Py_DECREF(output); return 0; } |