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.

Sign up for GitHub

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

Jump to bottom

Dynamic deadpool poll time for faster exit detection on linux #148

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Dynamic deadpool poll time for faster exit detection on linux #148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions src/main/java/com/zaxxer/nuprocess/linux/ProcessEpoll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ class ProcessEpoll extends BaseEventProcessor<LinuxProcess>
private final EpollEvent triggeredEvent;
private final List<LinuxProcess> deadPool;

// see comment in #cleanupProcess for explanation on dynamicDeadpoolPollInterval
private int dynamicDeadpoolPollInterval = DEADPOOL_POLL_INTERVAL;

private LinuxProcess process;

ProcessEpoll()
Expand Down Expand Up @@ -191,7 +194,9 @@ public boolean process()
int stderrFd = Integer.MIN_VALUE;
LinuxProcess linuxProcess = null;
try {
int nev = LibEpoll.epoll_wait(epoll, triggeredEvent.getPointer(), 1, DEADPOOL_POLL_INTERVAL);
int nev = LibEpoll.epoll_wait(epoll, triggeredEvent.getPointer(), 1, dynamicDeadpoolPollInterval);
// see comment in #cleanupProcess for explanation on dynamicDeadpoolPollInterval
dynamicDeadpoolPollInterval = Math.min(DEADPOOL_POLL_INTERVAL, 2 * dynamicDeadpoolPollInterval);
if (nev == -1) {
int errno = Native.getLastError();
if (errno == LibC.EINTR) {
Expand Down Expand Up @@ -292,20 +297,17 @@ protected void close()

private void cleanupProcess(LinuxProcess linuxProcess, int stdinFd, int stdoutFd, int stderrFd)
{
// we detected a close of a stream, this means that the process is going to be closed soon or is already closed
// in the absence of other EPoll events this means that we might wait for the full DEADPOOL_POLL_INTERVAL
// before we do waitpid check again. With dynamic poll interval, we check again in the intervals of
// 1, 2, 4, 8, ... DEADPOOL_POLL_INTERVAL ms. This allows us to catch exit much sooner.
dynamicDeadpoolPollInterval = 1;

pidToProcessMap.remove(linuxProcess.getPid());
fildesToProcessMap.remove(stdinFd);
fildesToProcessMap.remove(stdoutFd);
fildesToProcessMap.remove(stderrFd);

// linuxProcess.close(linuxProcess.getStdin());
// linuxProcess.close(linuxProcess.getStdout());
// linuxProcess.close(linuxProcess.getStderr());

if (linuxProcess.cleanlyExitedBeforeProcess.get()) {
linuxProcess.onExit(0);
return;
}

IntByReference ret = new IntByReference();
int rc = LibC.waitpid(linuxProcess.getPid(), ret, LibC.WNOHANG);

Expand Down