Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use process group signal handling to reach past the shell #1126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/tools/Subprocess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@ class SubprocessPid {
void stop() noexcept {
// Signals give problems with MPI on Travis.
// I disable them for now.
if(SubprocessPidGetenvSignals()) kill(pid,SIGSTOP);
if(SubprocessPidGetenvSignals()) kill(-pid,SIGSTOP);
}
void cont() noexcept {
// Signals give problems with MPI on Travis.
// I disable them for now.
if(SubprocessPidGetenvSignals()) kill(pid,SIGCONT);
if(SubprocessPidGetenvSignals()) kill(-pid,SIGCONT);
}
~SubprocessPid() {
// the destructor implies we do not need the subprocess anymore, so SIGKILL
// is the fastest exit.
// if we want to gracefully kill the process with a delay, it would be cleaner
// to have another member function
kill(pid,SIGKILL);
kill(-pid,SIGINT);
// Wait for the child process to terminate
// This is anyway required to avoid leaks
int status;
Expand Down Expand Up @@ -99,6 +99,7 @@ Subprocess::Subprocess(const std::string & cmd) {
if(dup(pc[0])<0) plumed_error()<<"error duplicating file";
if(close(pc[1])<0) plumed_error()<<"error closing file";
if(close(cp[0])<0) plumed_error()<<"error closing file";
if(setpgid(0,0)<0) plumed_error()<<"error setting process group";;
auto err=execv(arr[0],arr);
plumed_error()<<"error in script file " << cmd << ", execv returned "<<err;
}
Expand Down
Loading