fixed incompatible shutdown behaviors

Author: StevenArzt

soot-infoflow/src/soot/jimple/infoflow/Infoflow.java

@@ -54,7 +54,6 @@
 import soot.jimple.infoflow.data.AbstractionAtSink;
 import soot.jimple.infoflow.data.AccessPathFactory;
 import soot.jimple.infoflow.data.FlowDroidMemoryManager.PathDataErasureMode;
-import soot.jimple.infoflow.data.pathBuilders.BatchPathBuilder;
 import soot.jimple.infoflow.data.pathBuilders.DefaultPathBuilderFactory;
 import soot.jimple.infoflow.data.pathBuilders.IAbstractionPathBuilder;
 import soot.jimple.infoflow.data.pathBuilders.IAbstractionPathBuilder.OnPathBuilderResultAvailable;
@@ -771,7 +770,7 @@ else if (logger.isInfoEnabled()) {
 	 * @return The path builder implementation
 	 */
 	protected IAbstractionPathBuilder createPathBuilder(InterruptableExecutor executor) {
-		return new BatchPathBuilder(manager, pathBuilderFactory.createPathBuilder(manager, executor));
+		return pathBuilderFactory.createPathBuilder(manager, executor);
 	}
 
 	/**

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/BatchPathBuilder.java

@@ -22,9 +22,9 @@
  */
 public class BatchPathBuilder extends AbstractAbstractionPathBuilder {
 
-	private final IAbstractionPathBuilder innerBuilder;
-	private int batchSize = 5;
-	private ISolverTerminationReason terminationReason = null;
+	protected final IAbstractionPathBuilder innerBuilder;
+	protected int batchSize = 5;
+	protected ISolverTerminationReason terminationReason = null;
 
 	public BatchPathBuilder(InfoflowManager manager, IAbstractionPathBuilder innerBuilder) {
 		super(manager);

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/DefaultPathBuilderFactory.java

@@ -1,12 +1,14 @@
 package soot.jimple.infoflow.data.pathBuilders;
 
+import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
 import soot.jimple.infoflow.InfoflowConfiguration.PathBuildingAlgorithm;
 import soot.jimple.infoflow.InfoflowConfiguration.PathConfiguration;
 import soot.jimple.infoflow.InfoflowManager;
+import soot.jimple.infoflow.data.AbstractionAtSink;
 import soot.jimple.infoflow.solver.executors.InterruptableExecutor;
 
 /**
@@ -18,11 +20,49 @@ public class DefaultPathBuilderFactory implements IPathBuilderFactory {
 
 	private final PathConfiguration pathConfiguration;
 
+	/**
+	 * Repeatable context-senisitive path builder
+	 * 
+	 * @author Steven Arzt
+	 *
+	 */
+	private static class RepeatableContextSensitivePathBuilder extends ContextSensitivePathBuilder {
+
+		public RepeatableContextSensitivePathBuilder(InfoflowManager manager) {
+			super(manager);
+		}
+
+		@Override
+		protected void onTaintPathsComputed() {
+			// Do not terminate the executor
+		}
+
+	}
+
+	/**
+	 * Variant of the {@link BatchPathBuilder} that can shut down the inner builder
+	 * 
+	 * @author Steven Arzt
+	 *
+	 */
+	private static class ShutdownBatchPathBuilder extends BatchPathBuilder {
+
+		public ShutdownBatchPathBuilder(InfoflowManager manager, RepeatableContextSensitivePathBuilder innerBuilder) {
+			super(manager, innerBuilder);
+		}
+
+		@Override
+		public void computeTaintPaths(Set<AbstractionAtSink> res) {
+			super.computeTaintPaths(res);
+			((RepeatableContextSensitivePathBuilder) innerBuilder).onTaintPathsComputed();
+		}
+
+	}
+
 	/**
 	 * Creates a new instance of the {@link DefaultPathBuilderFactory} class
 	 * 
-	 * @param config
-	 *            The configuration for reconstructing data flow paths
+	 * @param config The configuration for reconstructing data flow paths
 	 */
 	public DefaultPathBuilderFactory(PathConfiguration config) {
 		this.pathConfiguration = config;
@@ -31,8 +71,7 @@ public DefaultPathBuilderFactory(PathConfiguration config) {
 	/**
 	 * Creates a new executor object for spawning worker threads
 	 * 
-	 * @param maxThreadNum
-	 *            The number of threads to use
+	 * @param maxThreadNum The number of threads to use
 	 * @return The generated executor
 	 */
 	private InterruptableExecutor createExecutor(int maxThreadNum) {
@@ -60,13 +99,13 @@ public IAbstractionPathBuilder createPathBuilder(InfoflowManager manager, int ma
 	public IAbstractionPathBuilder createPathBuilder(InfoflowManager manager, InterruptableExecutor executor) {
 		switch (pathConfiguration.getPathBuildingAlgorithm()) {
 		case Recursive:
-			return new RecursivePathBuilder(manager, executor);
+			return new BatchPathBuilder(manager, new RecursivePathBuilder(manager, executor));
 		case ContextSensitive:
-			return new ContextSensitivePathBuilder(manager);
+			return new ShutdownBatchPathBuilder(manager, new RepeatableContextSensitivePathBuilder(manager));
 		case ContextInsensitive:
-			return new ContextInsensitivePathBuilder(manager, executor);
+			return new BatchPathBuilder(manager, new ContextInsensitivePathBuilder(manager, executor));
 		case ContextInsensitiveSourceFinder:
-			return new ContextInsensitiveSourceFinder(manager, executor);
+			return new BatchPathBuilder(manager, new ContextInsensitiveSourceFinder(manager, executor));
 		case None:
 			return new EmptyPathBuilder();
 		}