Skip to content

Run cppcheck off the ReadAction thread #111

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
harmstyler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Run cppcheck off the ReadAction thread #111

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
20 changes: 17 additions & 3 deletions src/com/github/johnthagen/cppcheck/CppCheckInspectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
import com.intellij.execution.process.CapturingProcessHandler;
import com.intellij.execution.process.ProcessOutput;
import com.intellij.notification.NotificationType;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.progress.EmptyProgressIndicator;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressIndicatorUtils;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
Expand All @@ -33,6 +35,7 @@
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Future;

class CppCheckInspectionImpl {
CppCheckInspectionImpl(final int verboseLevel) {
Expand Down Expand Up @@ -283,9 +286,20 @@ public String executeCommandOnFile(@NotNull final VirtualFile vFile,

final CapturingProcessHandler processHandler = new CapturingProcessHandler(cmd);
final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
final ProcessOutput output = processHandler.runProcessWithProgressIndicator(
indicator != null ? indicator : new EmptyProgressIndicator(),
TIMEOUT_MS);
// The platform forbids blocking subprocess waitFor() calls from a ReadAction thread
// (LocalInspectionTool.checkFile runs under one). Run the subprocess on a pooled thread
// and await it via ProgressIndicatorUtils so outer cancellation is still honored.
final ProgressIndicator effectiveIndicator = indicator != null ? indicator : new EmptyProgressIndicator();
final Future<ProcessOutput> future = ApplicationManager.getApplication().executeOnPooledThread(
() -> processHandler.runProcessWithProgressIndicator(effectiveIndicator, TIMEOUT_MS));
final ProcessOutput output;
try {
output = ProgressIndicatorUtils.awaitWithCheckCanceled(future);
} catch (final ProcessCanceledException e) {
future.cancel(true);
processHandler.destroyProcess();
throw e;
}

if (output.isCancelled()) {
throw new ProcessCanceledException();
Expand Down