Repository navigation
Fix file descriptor cleanup on OpenBSD #571
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.
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
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,12 +24,20 @@ | |
| // | ||
| // gives us | ||
| // | ||
| // int closefrom(int fd); | ||
| // void closefrom(int lowfd); | ||
| // int close_range(u_int lowfd, u_int highfd, int flags); | ||
|
|
||
| #include <unistd.h> | ||
| #define BOOST_PROCESS_V2_HAS_CLOSE_RANGE_AND_CLOSEFROM 1 | ||
|
|
||
| #elif defined(__OpenBSD__) | ||
|
|
||
| // https://man.openbsd.org/closefrom.2 | ||
| // int closefrom(int fd); | ||
|
|
||
| #include <unistd.h> | ||
| #define BOOST_PROCESS_V2_HAS_CLOSEFROM_WITH_ERRNO 1 | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. bikeshed, WITH_EINTR ?
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I thought the difference is the return type of the closefrom signature?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, and also the fact that on OpenBSD closefrom() could be stopped on EINTR; thus, we need to check errno and restart the call if we actually want to close the remaining fd.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note the same applies to NetBSD also (https://man.netbsd.org/closefrom.3). And NetBSD may also benefit from using the same implementation without close_range() even if users can use fdescfs instead of the default fd driver (which have same issue as OpenBSD). |
||
|
|
||
| #elif defined(__sun) | ||
|
|
||
| /*https://docs.oracle.com/cd/E36784_01/html/E36874/closefrom-3c.html | ||
|
|
@@ -113,6 +121,36 @@ void close_all(const std::vector<int> & whitelist, error_code & ec) | |
| ec = BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error(); | ||
| } | ||
|
|
||
| #elif defined(BOOST_PROCESS_V2_HAS_CLOSEFROM_WITH_ERRNO) | ||
|
|
||
| // OpenBSD impl - whitelist must be ordered | ||
| void close_all(const std::vector<int> & whitelist, error_code & /*ec*/) | ||
| { | ||
| //the most common scenario is whitelist = {0,1,2} | ||
| if (!whitelist.empty()) | ||
| { | ||
| if (whitelist.front() != 0) { | ||
| for (int fd = 0; fd < whitelist.front(); fd++) | ||
| while (::close(fd) == -1 && errno == EINTR); | ||
| } | ||
| for (std::size_t idx = 0u; | ||
| idx < (whitelist.size() - 1u); | ||
| idx++) | ||
| { | ||
| const auto mine = whitelist[idx]; | ||
| const auto next = whitelist[idx + 1]; | ||
| if ((mine + 1) != next && (mine != next)) | ||
| { | ||
| for (int fd = mine + 1; fd < next; fd++) | ||
| while (::close(fd) == -1 && errno == EINTR); | ||
| } | ||
| } | ||
| while (::closefrom(whitelist.back() + 1) == -1 && errno == EINTR); | ||
| } | ||
| else | ||
| while (::closefrom(0) == -1 && errno == EINTR); | ||
| } | ||
|
|
||
| #elif defined(BOOST_PROCESS_V2_HAS_CLOSE_RANGE_AND_CLOSEFROM) | ||
|
|
||
| // freeBSD impl - whitelist must be ordered | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just notice that FreeBSD closefrom differ from OpenBSD; see the comment below
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Finally it looks better to split them.