mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 21:03:12 +00:00
Add workaround for Cygwin process management and job control bugs
We cannot wait by pgroup under Cygwin for unknown reasons. Always wait on jobs by individual processes. See code for more information.
This commit is contained in:
parent
63e70d601d
commit
d1913f0df0
4 changed files with 38 additions and 3 deletions
|
@ -19,6 +19,11 @@ if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft")
|
||||||
SET(WSL 1)
|
SET(WSL 1)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Detect Cygwin.
|
||||||
|
if (CMAKE_SYSTEM_NAME MATCHES "CYGWIN_NT.*")
|
||||||
|
SET(CYGWIN 1)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Set up the config.h file.
|
# Set up the config.h file.
|
||||||
SET(PACKAGE_NAME "fish")
|
SET(PACKAGE_NAME "fish")
|
||||||
SET(PACKAGE_TARNAME "fish")
|
SET(PACKAGE_TARNAME "fish")
|
||||||
|
|
|
@ -4,6 +4,9 @@
|
||||||
/* Define to 1 if compiled on WSL */
|
/* Define to 1 if compiled on WSL */
|
||||||
#cmakedefine WSL 1
|
#cmakedefine WSL 1
|
||||||
|
|
||||||
|
/* Define to 1 if complied under Cygwin */
|
||||||
|
#cmakedefine CYGWIN 1
|
||||||
|
|
||||||
/* Define to 1 if you have the `clock_gettime' function. */
|
/* Define to 1 if you have the `clock_gettime' function. */
|
||||||
#cmakedefine HAVE_CLOCK_GETTIME 1
|
#cmakedefine HAVE_CLOCK_GETTIME 1
|
||||||
|
|
||||||
|
|
|
@ -947,6 +947,15 @@ constexpr bool is_windows_subsystem_for_linux() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Detect if we are running under Cygwin or Cgywin64
|
||||||
|
constexpr bool is_cygwin() {
|
||||||
|
#ifdef CYGWIN
|
||||||
|
return true;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
__attribute__((noinline)) void debug_thread_error(void);
|
__attribute__((noinline)) void debug_thread_error(void);
|
||||||
}
|
}
|
||||||
|
|
24
src/proc.cpp
24
src/proc.cpp
|
@ -448,9 +448,27 @@ static bool process_mark_finished_children(bool block_on_fg) {
|
||||||
options &= ~WNOHANG;
|
options &= ~WNOHANG;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the pgid is 0, we need to wait by process because that's invalid.
|
// Child jobs (produced via execution of functions) share job ids with their not-yet-
|
||||||
// This happens in firejail for reasons not entirely clear to me.
|
// fully-constructed parent jobs, so we have to wait on these by individual process id
|
||||||
bool wait_by_process = !j->job_chain_is_fully_constructed() || j->pgid == 0;
|
// and not by the shared pgroup. End result is the same, but it just makes more calls
|
||||||
|
// to the kernel.
|
||||||
|
bool wait_by_process = !j->job_chain_is_fully_constructed();
|
||||||
|
|
||||||
|
// Firejail can result in jobs with pgroup 0, in which case we cannot wait by
|
||||||
|
// job id. See discussion in #5295.
|
||||||
|
if (j->pgid == 0) {
|
||||||
|
wait_by_process = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cygwin does some voodoo with regards to process management that I do not understand, but
|
||||||
|
// long story short, we cannot reap processes by their pgroup. The way child processes are
|
||||||
|
// launched under Cygwin is... weird, and outwardly they do not appear to retain information
|
||||||
|
// about their parent process when viewed in Task Manager. Waiting on processes by their
|
||||||
|
// pgroup results in never reaping any, so we just wait on them by process id instead.
|
||||||
|
if (is_cygwin()) {
|
||||||
|
wait_by_process = true;
|
||||||
|
}
|
||||||
|
|
||||||
// When waiting on processes individually in a pipeline, we need to enumerate in reverse
|
// When waiting on processes individually in a pipeline, we need to enumerate in reverse
|
||||||
// order so that the first process we actually wait on (i.e. ~WNOHANG) is the last process
|
// order so that the first process we actually wait on (i.e. ~WNOHANG) is the last process
|
||||||
// in the IO chain, because that's the one that controls the lifetime of the foreground job
|
// in the IO chain, because that's the one that controls the lifetime of the foreground job
|
||||||
|
|
Loading…
Reference in a new issue