github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-24 00:53:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Retry setpgid in setup_child_process on EPERM"

Browse Source 
This reverts commit d6c4e66484957355d4985938ca30bc5d31ddc156.
It was meant for the major branch.
This commit is contained in:
Kurtis Rader 2017-08-13 15:27:08 -07:00
parent ac4eedb436
commit 92628a384b
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/exec.cpp
View File

@ -935,10 +935,11 @@ void exec_job(parser_t &parser, job_t *j) {
// output, so that we can truncate the file. Does not apply to /dev/null.
bool must_fork = redirection_is_to_real_file(stdout_io.get()) ||
redirection_is_to_real_file(stderr_io.get());
if (!must_fork && p->is_last_in_job) {
if (!must_fork) {
//we are handling reads directly in the main loop. Make sure source is unblocked.
//Note that we may still end up forking.
unblock_previous();
}
if (!must_fork && p->is_last_in_job) {
const bool stdout_is_to_buffer = stdout_io && stdout_io->io_mode == IO_BUFFER;
const bool no_stdout_output = stdout_buffer.empty();
const bool no_stderr_output = stderr_buffer.empty();

6
src/postfork.cpp
View File

@ -78,13 +78,7 @@ bool child_set_group(job_t *j, process_t *p) {
if (j->pgid == -2) {
j->pgid = p->pid;
}
//retry on EPERM because there's no way that a child cannot join an existing progress group
//because we are SIGSTOPing the previous job in the chain. Sometimes we have to try a few
//times to get the kernel to see the new group. (Linux 4.4.0)
int failure = setpgid(p->pid, j->pgid);
while (failure == -1 && errno == EPERM) {
debug_safe(2, "Retrying setpgid in child process");
}
// TODO: Figure out why we're testing whether the pgid is correct after attempting to
// set it failed. This was added in commit 4e912ef8 from 2012-02-27.
failure = failure && getpgid(p->pid) != j->pgid;