Skip to content

[2.7] bpo-35757: subprocess.Popen: optimize close_fds for Linux #11584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kolyshkin wants to merge 1 commit into from
Closed

[2.7] bpo-35757: subprocess.Popen: optimize close_fds for Linux #11584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Lib/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,27 @@ def pipe_cloexec(self):


def _close_fds(self, but):
if sys.platform.startswith("linux"):
# Try closing the actual opened fds (obtained via /proc),
# as this is way faster than iterating through MAX_FD
try:
for f in os.listdir("/proc/self/fd"):
try:
fd = int(f)
except (ValueError, TypeError): # should not happen
continue
if fd < 3 or fd == but:
continue

try:
os.close(fd)
except OSError:
pass
return
except OSError:
# /proc not available? fall back to the old method
pass

if hasattr(os, 'closerange'):
os.closerange(3, but)
os.closerange(but + 1, MAXFD)
Expand Down