github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 19:03:38 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove repeated acquire of disowned pid lock in a loop

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi 2020-07-25 20:31:44 -05:00
parent 2c5d4937e3
commit d46b9ff9be
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/proc.cpp
View File

@ -329,18 +329,19 @@ static owning_lock<std::vector<pid_t>> s_disowned_pids;
void add_disowned_job(job_t *j) {
if (j == nullptr) return;
// NEVER add our own (or an invalid) pgid as they are not unique to only
// Never add our own (or an invalid) pgid as it is not unique to only
// one job, and may result in a deadlock if we attempt the wait.
auto pgid = j->get_pgid();
auto disowned_pids = s_disowned_pids.acquire();
if (pgid && *pgid != getpgrp() && *pgid > 0) {
// waitpid(2) is signalled to wait on a process group rather than a
// process id by using the negative of its value.
s_disowned_pids.acquire()->push_back(*pgid * -1);
disowned_pids->push_back(*pgid * -1);
} else {
// Instead, add the PIDs of any external processes
for (auto &process : j->processes) {
if (process->pid) {
s_disowned_pids.acquire()->push_back(process->pid);
disowned_pids->push_back(process->pid);
}
}
}