Merge pull request #191 from Vodorok/jobcancel

Cancelable CodeChecker analyze

Author: dkrupp

bundles/org.codechecker.eclipse.plugin/src/org/codechecker/eclipse/plugin/codechecker/CodeChecker.java

@@ -120,4 +120,9 @@ private String getSubstituteAnalyzeString(CcConfigurationBase config) {
                 + config.get(ConfigTypes.ANAL_THREADS) + " -n javarunner" + " -o " + RESULTS_SUB + OPTION_SEPARATOR
                 + LOGFILE_SUB + OPTION_SEPARATOR + config.get(ConfigTypes.ANAL_OPTIONS);
     }
+
+    @Override
+    public void cancelAnalyze() {
+        she.cancel();
+    }
 }

bundles/org.codechecker.eclipse.plugin/src/org/codechecker/eclipse/plugin/codechecker/ICodeChecker.java

@@ -70,4 +70,6 @@ public interface ICodeChecker {
      */
     public String analyze(Path logFile, boolean logToConsole, IProgressMonitor monitor, int taskCount,
             CcConfigurationBase config);
+
+    public void cancelAnalyze();
 }

bundles/org.codechecker.eclipse.plugin/src/org/codechecker/eclipse/plugin/report/job/AnalyzeJob.java

@@ -84,6 +84,11 @@ public void accept(String t) {
         return Status.OK_STATUS;
     }
 
+    @Override
+    protected void canceling() {
+        config.getCodeChecker().cancelAnalyze();
+    }
+
     /**
      * Creates a copy of the log file created by ld logger, to avoid concurrency
      * issues.
@@ -107,4 +112,5 @@ public void deleteLogFile() {
             Logger.log(IStatus.ERROR, "Couldn't delete the temporary log file!");
         }
     }
+
 }

bundles/org.codechecker.eclipse.plugin/src/org/codechecker/eclipse/plugin/runtime/ShellExecutorHelper.java

@@ -1,22 +1,29 @@
 package org.codechecker.eclipse.plugin.runtime;
 
-import com.google.common.base.Optional;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Vector;
 
-import org.apache.commons.exec.*;
+import org.apache.commons.exec.CommandLine;
+import org.apache.commons.exec.DefaultExecutor;
+import org.apache.commons.exec.ExecuteWatchdog;
+import org.apache.commons.exec.Executor;
+import org.apache.commons.exec.LogOutputStream;
+import org.apache.commons.exec.PumpStreamHandler;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jdt.annotation.Nullable;
 
-import java.io.*;
-import java.util.Map;
-import java.util.Vector;
+import com.google.common.base.Optional;
 
 public class ShellExecutorHelper {
 
     private static final int DEFAULT_TIMEOUT = 1000; // in milliseconds
     private static final String WRAP_CHARACTER = "\"";
 
+    private Executor ec;
     final Map<String, String> environment;
 
     public ShellExecutorHelper(Map<String, String> environment) {
@@ -32,7 +39,7 @@ public ShellExecutorHelper(Map<String, String> environment) {
      * @return The first line of the script's output in an Optional wrapper.
      */
     public Optional<String> quickReturnFirstLine(String cmd, @Nullable Map<String, File> substitutionMap) {
-        Executor ec = build(DEFAULT_TIMEOUT);
+        ec = build(DEFAULT_TIMEOUT);
         try {
             OneLineReader olr = new OneLineReader();
             ec.setStreamHandler(new PumpStreamHandler(olr));
@@ -63,7 +70,7 @@ public Optional<String> quickReturnOutput(String cmd, @Nullable Map<String, File
      * @return The script's output in an Optional wrapper.
      */
     public Optional<String> quickReturnOutput(String cmd, @Nullable Map<String, File> substitutionMap, double timeOut) {
-        Executor ec = build(new Double(timeOut).longValue());
+        ec = build(new Double(timeOut).longValue());
         try {
             AllLineReader olr = new AllLineReader();
             ec.setStreamHandler(new PumpStreamHandler(olr));
@@ -83,7 +90,7 @@ public Optional<String> quickReturnOutput(String cmd, @Nullable Map<String, File
      * @return The script's output in an Optional wrapper.
      */
     public Optional<String> waitReturnOutput(String cmd, @Nullable Map<String, File> substitutionMap, boolean logToConsole) {
-        Executor ec = build();
+        ec = build();
         try {
             AllLineReader olr = new AllLineReader(logToConsole);
             ec.setStreamHandler(new PumpStreamHandler(olr));
@@ -107,7 +114,7 @@ public Optional<String> waitReturnOutput(String cmd, @Nullable Map<String, File>
      */
     public Optional<String> progressableWaitReturnOutput(String cmd, @Nullable Map<String, File> substitutionMap,
             boolean logToConsole, IProgressMonitor monitor, int taskCount) {
-        Executor ec = build();
+        ec = build();
         try {
             AllLineReader olr = new ProgressableAllLineReader(logToConsole, monitor, taskCount);
             ec.setStreamHandler(new PumpStreamHandler(olr));
@@ -127,7 +134,7 @@ public Optional<String> progressableWaitReturnOutput(String cmd, @Nullable Map<S
      * @return true if successful
      */
     public boolean quickAndSuccessfull(String cmd, @Nullable Map<String, File> substitutionMap) {
-        Executor ec = build(DEFAULT_TIMEOUT);
+        ec = build(DEFAULT_TIMEOUT);
         try {
             ec.execute(buildScriptCommandLine(cmd, substitutionMap), environment);
             return true;
@@ -173,6 +180,10 @@ private Executor build(Optional<String> workingDirectory, long timeoutInMilliSec
         return executor;
     }
 
+    public void cancel() {
+        ec.getWatchdog().destroyProcess();
+    }
+
     class PidObject {
         int pid;
     }