adapted to new path builder

Author: StevenArzt

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/postProcessor/InfoflowResultPostProcessor.java

@@ -3,9 +3,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +32,6 @@
 import soot.jimple.infoflow.methodSummary.postProcessor.SummaryPathBuilder.SummarySourceInfo;
 import soot.jimple.infoflow.methodSummary.taintWrappers.AccessPathFragment;
 import soot.jimple.infoflow.methodSummary.util.AliasUtils;
-import soot.jimple.infoflow.solver.executors.InterruptableExecutor;
 import soot.jimple.infoflow.util.SootMethodRepresentationParser;
 import soot.util.MultiMap;
 
@@ -115,20 +111,7 @@ public MethodSummaries postProcess(MethodSummaries flows) {
 		if (collectedAbstractions != null && !collectedAbstractions.isEmpty()) {
 			// Create a context-sensitive path builder. Without context-sensitivity,
 			// we get quite some false positives here.
-			InterruptableExecutor executor = new InterruptableExecutor(Runtime.getRuntime().availableProcessors(),
-					Runtime.getRuntime().availableProcessors(), 30, TimeUnit.SECONDS,
-					new LinkedBlockingQueue<Runnable>());
-			executor.setThreadFactory(new ThreadFactory() {
-
-				@Override
-				public Thread newThread(Runnable r) {
-					Thread thr = new Thread(r);
-					thr.setDaemon(true);
-					thr.setName("Post processing");
-					return thr;
-				}
-			});
-			SummaryPathBuilder pathBuilder = new SummaryPathBuilder(manager, executor);
+			SummaryPathBuilder pathBuilder = new SummaryPathBuilder(manager);
 
 			for (Abstraction a : collectedAbstractions.keySet()) {
 				// If this abstraction is directly the source abstraction, we do not
@@ -149,13 +132,6 @@ public Thread newThread(Runnable r) {
 					pathBuilder.computeTaintPaths(
 							Collections.singleton(new AbstractionAtSink(null, a, a.getCurrentStmt())));
 
-					// Wait for the executor to complete all of its tasks
-					try {
-						executor.awaitCompletion();
-					} catch (InterruptedException e) {
-						logger.error("Could not wait for executor termination", e);
-					}
-
 					logger.info("Obtained {} source-to-sink connections.", pathBuilder.getResultInfos().size());
 
 					// Reconstruct the sources

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/postProcessor/SummaryPathBuilder.java

@@ -18,7 +18,6 @@
 import soot.jimple.infoflow.results.InfoflowResults;
 import soot.jimple.infoflow.results.ResultSinkInfo;
 import soot.jimple.infoflow.results.ResultSourceInfo;
-import soot.jimple.infoflow.solver.executors.InterruptableExecutor;
 import soot.jimple.infoflow.sourcesSinks.manager.SourceInfo;
 
 /**
@@ -189,8 +188,8 @@ public boolean equals(Object obj) {
 	 *                 objects
 	 * @param executor The executor in which to run the path reconstruction tasks
 	 */
-	public SummaryPathBuilder(InfoflowManager manager, InterruptableExecutor executor) {
-		super(manager, executor);
+	public SummaryPathBuilder(InfoflowManager manager) {
+		super(manager);
 		this.context = new SummaryPathBuilderContext(manager.getTaintWrapper());
 	}