Mercurial > cpython-lru_cache-weakref
diff Lib/multiprocessing/forking.py @ 59472:024c53a86521
Merged revisions 78777,78787,78790 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78777 | florent.xicluna | 2010-03-08 00:49:03 +0100 (lun, 08 mar 2010) | 4 lines
Backport the Popen.poll() protection from subprocess to multiprocessing. See #1731717.
It should fix transient failures on test_multiprocessing.
........
r78787 | florent.xicluna | 2010-03-08 08:21:16 +0100 (lun, 08 mar 2010) | 2 lines
Don't fail on a debug() statement, if the worker PID is (still) None.
........
r78790 | florent.xicluna | 2010-03-08 12:01:39 +0100 (lun, 08 mar 2010) | 2 lines
On finalize, don't try to join not started process.
........
| author | Florent Xicluna <florent.xicluna@gmail.com> |
|---|---|
| date | Mon, 08 Mar 2010 13:32:17 +0000 |
| parents | 8dc479b63e03 |
| children | fd7f73e12568 |
line wrap: on
line diff
--- a/Lib/multiprocessing/forking.py Mon Mar 08 13:27:26 2010 +0000 +++ b/Lib/multiprocessing/forking.py Mon Mar 08 13:32:17 2010 +0000 @@ -104,7 +104,12 @@ def poll(self, flag=os.WNOHANG): if self.returncode is None: - pid, sts = os.waitpid(self.pid, flag) + try: + pid, sts = os.waitpid(self.pid, flag) + except os.error: + # Child process not yet created. See #1731717 + # e.errno == errno.ECHILD == 10 + return None if pid == self.pid: if os.WIFSIGNALED(sts): self.returncode = -os.WTERMSIG(sts)