FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-38061: os.closerange() uses closefrom() on FreeBSD by vstinner · Pull Request #19696 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-38061: os.closerange() uses closefrom() on FreeBSD #19696

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

Merged
vstinner merged 1 commit into from
Apr 24, 2020
Conversation 8 Commits 1 Checks 0 Files changed
Merged

bpo-38061: os.closerange() uses closefrom() on FreeBSD #19696

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

Filter by extension

Filter by extension .c  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 6 additions & 0 deletions Misc/NEWS.d/next/Library/2020-04-24-01-27-08.bpo-38061.cdlkMz.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
On FreeBSD, ``os.closerange(fd_low, fd_high)`` now calls ``closefrom(fd_low)``
if *fd_high* is greater than or equal to ``sysconf(_SC_OPEN_MAX)``.

Initial patch by Ed Maste (emaste), Conrad Meyer (cem), Kyle Evans (kevans)
and Kubilay Kocak (koobs):

koobs Apr 24, 2020

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Can remove this, full credit to Ed, Conrad & Kyle

vstinner Apr 24, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Even if you didn't write the patch itself, you helped to get it in FreeBSD package, and so you deserve to be credited for this work ;-) Thanks @koobs!
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242274
27 changes: 20 additions & 7 deletions Modules/posixmodule.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -8687,10 +8687,13 @@ _fdwalk_close_func(void *lohi, int fd)
int lo = ((int *)lohi)[0];
int hi = ((int *)lohi)[1];

if (fd >= hi)
if (fd >= hi) {
return 1;
else if (fd >= lo)
close(fd);
}
else if (fd >= lo) {
/* Ignore errors */
(void)close(fd);
}
return 0;
}
#endif /* HAVE_FDWALK */
Expand All @@ -8711,8 +8714,6 @@ os_closerange_impl(PyObject *module, int fd_low, int fd_high)
{
#ifdef HAVE_FDWALK
int lohi[2];
#else
int i;
#endif
Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH
Expand All @@ -8721,8 +8722,20 @@ os_closerange_impl(PyObject *module, int fd_low, int fd_high)
lohi[1] = fd_high;
fdwalk(_fdwalk_close_func, lohi);
#else
for (i = Py_MAX(fd_low, 0); i < fd_high; i++)
close(i);
fd_low = Py_MAX(fd_low, 0);
#ifdef __FreeBSD__
if (fd_high >= sysconf(_SC_OPEN_MAX)) {
/* Any errors encountered while closing file descriptors are ignored */
closefrom(fd_low);
}
else
#endif
{
for (int i = fd_low; i < fd_high; i++) {
/* Ignore errors */
(void)close(i);
}
}
#endif
_Py_END_SUPPRESS_IPH
Py_END_ALLOW_THREADS
Expand Down
Back | FazBrowse Home | New Git URL