Skip to content

waitForJobs: don't wait for setInterval() jobs. #115

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

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

waitForJobs: don't wait for setInterval() jobs. #115

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
38 changes: 24 additions & 14 deletions ...in/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptJobManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,16 @@ public synchronized int getJobCount(final JavaScriptJobFilter filter) {
}
return count;
}

public synchronized int getNonPeriodicJobsCount() {
int count = 0;
for (final JavaScriptJob job : scheduledJobsQ_)
if (!job.isPeriodic())
count++;
if (currentlyRunningJob_ != null && !currentlyRunningJob_.isPeriodic())
count++;
return count;
}

/** {@inheritDoc} */
@Override
Expand Down Expand Up @@ -185,29 +195,29 @@ public int waitForJobs(final long timeoutMillis) {
if (debug) {
LOG.debug("Waiting for all jobs to finish (will wait max " + timeoutMillis + " millis).");
}
if (timeoutMillis > 0) {
long now = System.currentTimeMillis();
final long end = now + timeoutMillis;
synchronized (this) {
if (timeoutMillis > 0) {
long now = System.currentTimeMillis();
final long end = now + timeoutMillis;

synchronized (this) {
while (getJobCount() > 0 && now < end) {
while (getNonPeriodicJobsCount() > 0 && now < end) {
try {
wait(end - now);
}
catch (final InterruptedException e) {
} catch (final InterruptedException e) {
LOG.error("InterruptedException while in waitForJobs", e);
}
// maybe a change triggers the wakup; we have to recalculate the
// wait time
now = System.currentTimeMillis();
}
}
}
final int jobs = getJobCount();
if (debug) {
LOG.debug("Finished waiting for all jobs to finish (final job count is " + jobs + ").");
}
return jobs;
}
final int jobs = getNonPeriodicJobsCount();
if (debug && jobs > 0) {
LOG.debug("Finished waiting for all jobs to finish (final job count is " + jobs + ").");
printQueue();
}
return jobs;
}
}

/** {@inheritDoc} */
Expand Down