RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 21:45:08 +00:00
Code Issues Activity Actions

Shell: Put children in their own process groups and fix job control

Browse source 
This commit fixes job control by putting children in their own process
group, and proxying TTY signals to active jobs.
This also cleans up the code around builtin_disown a bit to use
the newer job interfaces.
This commit is contained in:
AnotherTest 2020-07-12 18:51:47 +04:30 • committed by Andreas Kling
parent 3a7a689b87
commit 151e4d41ed
5 changed files with 49 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Shell/Shell.cpp
View file

@ -474,6 +474,7 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
return nullptr;
}
if (child == 0) {
setpgid(0, 0);
tcsetattr(0, TCSANOW, &default_termios);
for (auto& rewiring : rewirings) {
#ifdef SH_DEBUG
@ -523,6 +524,8 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
jobs.set((u64)child, job);
job->on_exit = [](auto job) {
if (!job->exited())
return;
if (job->is_running_in_background())
fprintf(stderr, "Shell: Job %d(%s) exited\n", job->pid(), job->cmd().characters());
job->disown();
@ -598,6 +601,8 @@ void Shell::restore_stdin()
void Shell::block_on_job(RefPtr<Job> job)
{
TemporaryChange<const Job*> current_job { m_current_job, job.ptr() };
if (!job)
return;
@ -1051,18 +1056,10 @@ void Shell::stop_all_jobs()
#ifdef SH_DEBUG
dbg() << "Job " << entry.value->pid() << " is not running in background";
#endif
if (killpg(entry.value->pgid(), SIGCONT) < 0) {
perror("killpg(CONT)");
}
kill_job(entry.value, SIGCONT);
}
if (killpg(entry.value->pgid(), SIGHUP) < 0) {
perror("killpg(HUP)");
}
if (killpg(entry.value->pgid(), SIGTERM) < 0) {
perror("killpg(TERM)");
}
kill_job(entry.value, SIGHUP);
}
usleep(10000); // Wait for a bit before killing the job
@ -1099,6 +1096,15 @@ const Job* Shell::find_job(u64 id)
return nullptr;
}
void Shell::kill_job(const Job* job, int sig)
{
if (!job)
return;
if (killpg(job->pgid(), sig) < 0)
perror("killpg(job)");
}
void Shell::save_to(JsonObject& object)
{
Core::Object::save_to(object);