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

Suspend the manager, then wait for any jobs and cancel remaining #2918

Closed
wants to merge 1 commit into from
Closed

Suspend the manager, then wait for any jobs and cancel remaining #2918

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
53 changes: 52 additions & 1 deletion tycho-apitools-plugin/src/main/java/org/eclipse/tycho/apitools/ApiAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
Expand Down Expand Up @@ -94,6 +97,39 @@ public ApiAnalysis(Collection<Path> baselineBundles, Collection<Path> dependency
public ApiAnalysisResult call() throws Exception {
ApiAnalysisResult result = new ApiAnalysisResult();
Platform.addLogListener((status, plugin) -> debug(status.toString()));
IJobManager jobManager = Job.getJobManager();
jobManager.addJobChangeListener(new IJobChangeListener() {

@Override
public void sleeping(IJobChangeEvent event) {
debug("Job " + event.getJob() + " sleeping...");
}

@Override
public void scheduled(IJobChangeEvent event) {
debug("Job " + event.getJob() + " scheduled...");
}

@Override
public void running(IJobChangeEvent event) {
debug("Job " + event.getJob() + " running...");
}

@Override
public void done(IJobChangeEvent event) {
debug("Job " + event.getJob() + " done...");
}

@Override
public void awake(IJobChangeEvent event) {
debug("Job " + event.getJob() + " awake...");
}

@Override
public void aboutToRun(IJobChangeEvent event) {
debug("Job " + event.getJob() + " aboutToRun...");
}
});
printVersion();
disableAutoBuild();
setTargetPlatform();
Expand Down Expand Up @@ -125,6 +161,20 @@ public ApiAnalysisResult call() throws Exception {
return result;
}

private void waitForAnyJobs() {
IJobManager manager = Job.getJobManager();
debug("Suspend JobManager...");
manager.suspend();
debug("Wait for JobManager become idle...");
while (!manager.isIdle()) {
Thread.onSpinWait();
}
// See https://github.com/eclipse-platform/eclipse.platform/issues/741
debug("Cancel remaining jobs...");
manager.cancel(null);
debug("JobManager is idle... no new jobs will run!");
}

private BundleComponent importProject() throws CoreException, IOException {
IPath projectPath = IPath.fromOSString(projectDir);
IPath projectDescriptionFile = projectPath.append(IProjectDescription.DESCRIPTION_FILE_NAME);
Expand All @@ -140,6 +190,7 @@ private BundleComponent importProject() throws CoreException, IOException {
project.create(projectDescription, new NullProgressMonitor());
project.open(new NullProgressMonitor());
createOutputFolder(project, projectPath);
waitForAnyJobs();
IApiBaseline workspaceBaseline = ApiPlugin.getDefault().getApiBaselineManager().getWorkspaceBaseline();
IApiComponent component = workspaceBaseline.getApiComponent(project);
if (component instanceof ProjectComponent projectComponent) {
Expand Down Expand Up @@ -203,7 +254,7 @@ private void disableAutoBuild() throws CoreException {
IWorkspaceDescription desc = workspace.getDescription();
desc.setAutoBuilding(false);
workspace.setDescription(desc);
PDECore.getDefault().getPreferencesManager().setValue(ICoreConstants.DISABLE_API_ANALYSIS_BUILDER, false);
PDECore.getDefault().getPreferencesManager().setValue(ICoreConstants.DISABLE_API_ANALYSIS_BUILDER, true);
PDECore.getDefault().getPreferencesManager().setValue(ICoreConstants.RUN_API_ANALYSIS_AS_JOB, false);
}

Expand Down
Loading