mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

Shell: Kill existing jobs when exiting

Browse source
This commit is contained in:
AnotherTest 2020-05-24 21:25:01 +04:30 • committed by Andreas Kling
parent 0d39418b0b
commit 143be7234f
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Shell/Shell.cpp
View file

@ -337,6 +337,7 @@ int Shell::builtin_dirs(int argc, const char** argv)
int Shell::builtin_exit(int, const char**)
{
stop_all_jobs();
printf("Good-bye!\n");
exit(0);
return 0;
@ -1744,5 +1745,44 @@ Shell::Shell()
Shell::~Shell()
{
stop_all_jobs();
save_history();
}
void Shell::stop_all_jobs()
{
if (!jobs.is_empty()) {
printf("Killing active jobs\n");
for (auto& entry : jobs) {
if (!entry.value->is_running_in_background()) {
#ifdef SH_DEBUG
dbg() << "Job " << entry.value->pid() << " is not running in background";
#endif
if (killpg(entry.value->pgid(), SIGCONT) < 0) {
perror("killpg(CONT)");
}
}
if (killpg(entry.value->pgid(), SIGHUP) < 0) {
perror("killpg(HUP)");
}
if (killpg(entry.value->pgid(), SIGTERM) < 0) {
perror("killpg(TERM)");
}
}
usleep(10000); // Wait for a bit before killing the job
for (auto& entry : jobs) {
#ifdef SH_DEBUG
dbg() << "Actively killing " << entry.value->pid() << "(" << entry.value->cmd() << ")";
#endif
if (killpg(entry.value->pgid(), SIGKILL) < 0) {
if (errno == ESRCH)
continue; // The process has exited all by itself.
perror("killpg(KILL)");
}
}
}
}

1
Shell/Shell.h
View file

@ -162,6 +162,7 @@ private:
};
void cache_path();
void stop_all_jobs();
IterationDecision wait_for_pid(const SpawnedProcess&, bool is_first_command_in_chain, int& return_value);