Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use pipe2 when creating pipes if avaialble

Browse source 
This allows us to avoid marking the pipe as CLOEXEC in some cases,
saving a system call.
This commit is contained in:
ridiculousfish 2021-02-05 11:32:32 -08:00
parent 97f29b1f4d
commit b79ec0122a
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/ConfigureChecks.cmake
View file

@ -107,6 +107,7 @@ check_include_file_cxx(sys/select.h HAVE_SYS_SELECT_H)
check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYS_SYSCTL_H) check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYS_SYSCTL_H)
check_include_file_cxx(termios.h HAVE_TERMIOS_H) # Needed for TIOCGWINSZ check_include_file_cxx(termios.h HAVE_TERMIOS_H) # Needed for TIOCGWINSZ
check_cxx_symbol_exists(pipe2 unistd.h HAVE_PIPE2)
check_cxx_symbol_exists(wcscasecmp wchar.h HAVE_WCSCASECMP) check_cxx_symbol_exists(wcscasecmp wchar.h HAVE_WCSCASECMP)
check_cxx_symbol_exists(wcsdup wchar.h HAVE_WCSDUP) check_cxx_symbol_exists(wcsdup wchar.h HAVE_WCSDUP)
check_cxx_symbol_exists(wcslcpy wchar.h HAVE_WCSLCPY) check_cxx_symbol_exists(wcslcpy wchar.h HAVE_WCSLCPY)

3
config_cmake.h.in
View file

@ -58,6 +58,9 @@
/* Define to 1 if you have the <ncurses/term.h> header file. */ /* Define to 1 if you have the <ncurses/term.h> header file. */
#cmakedefine HAVE_NCURSES_TERM_H 1 #cmakedefine HAVE_NCURSES_TERM_H 1
/* Define to 1 if you have the 'pipe2' function. */
#cmakedefine HAVE_PIPE2 1
/* Define to 1 if you have the <siginfo.h> header file. */ /* Define to 1 if you have the <siginfo.h> header file. */
#cmakedefine HAVE_SIGINFO_H 1 #cmakedefine HAVE_SIGINFO_H 1

15
src/fds.cpp
View file

@ -74,21 +74,30 @@ static autoclose_fd_t heightenize_fd(autoclose_fd_t fd, bool input_has_cloexec)
maybe_t<autoclose_pipes_t> make_autoclose_pipes() { maybe_t<autoclose_pipes_t> make_autoclose_pipes() {
int pipes[2] = {-1, -1}; int pipes[2] = {-1, -1};
// TODO: use pipe2 here if available. bool already_cloexec = false;
#ifdef HAVE_PIPE2
if (pipe2(pipes, O_CLOEXEC) < 0) {
FLOGF(warning, PIPE_ERROR);
wperror(L"pipe2");
return none();
}
already_cloexec = true;
#else
if (pipe(pipes) < 0) { if (pipe(pipes) < 0) {
FLOGF(warning, PIPE_ERROR); FLOGF(warning, PIPE_ERROR);
wperror(L"pipe"); wperror(L"pipe");
return none(); return none();
} }
#endif
autoclose_fd_t read_end{pipes[0]}; autoclose_fd_t read_end{pipes[0]};
autoclose_fd_t write_end{pipes[1]}; autoclose_fd_t write_end{pipes[1]};
// Ensure our fds are out of the user range. // Ensure our fds are out of the user range.
read_end = heightenize_fd(std::move(read_end), false); read_end = heightenize_fd(std::move(read_end), already_cloexec);
if (!read_end.valid()) return none(); if (!read_end.valid()) return none();
write_end = heightenize_fd(std::move(write_end), false); write_end = heightenize_fd(std::move(write_end), already_cloexec);
if (!write_end.valid()) return none(); if (!write_end.valid()) return none();
return autoclose_pipes_t(std::move(read_end), std::move(write_end)); return autoclose_pipes_t(std::move(read_end), std::move(write_end));