Merge pull request #342 from jpstotz/TimeoutWatcher

fixed usage of currentTimeMillis in TimeoutWatcher + minor improvements

Author: StevenArzt

soot-infoflow/src/soot/jimple/infoflow/data/AccessPathFactory.java

@@ -132,7 +132,7 @@ public AccessPath createAccessPath(Value val, SootField[] appendingFields, Type
 			boolean canHaveImmutableAliases) {
 		// Make sure that the base object is valid
 		if (val != null && !AccessPath.canContainValue(val)) {
-			logger.error(String.format("Access paths cannot be rooted in values of type %s", val.getClass().getName()));
+			logger.error("Access paths cannot be rooted in values of type {}", val.getClass().getName());
 			return null;
 		}
 
@@ -424,8 +424,8 @@ public AccessPath createAccessPath(Value val, SootField[] appendingFields, Type
 		assert value == null || !(!(baseType instanceof ArrayType) && !TypeUtils.isObjectLikeType(baseType)
 				&& value.getType() instanceof ArrayType);
 		assert value == null || !(baseType instanceof ArrayType && !(value.getType() instanceof ArrayType)
-				&& !TypeUtils.isObjectLikeType(value.getType())) : "Type mismatch. Type was " + baseType
-						+ ", value was: " + (value == null ? null : value.getType());
+				&& !TypeUtils.isObjectLikeType(value.getType()))
+				: "Type mismatch. Type was " + baseType + ", value was: " + (value == null ? null : value.getType());
 
 		if ((fields == null && fieldTypes != null) || (fields != null && fieldTypes == null))
 			throw new RuntimeException("When there are fields, there must be field types and vice versa");
@@ -435,16 +435,20 @@ public AccessPath createAccessPath(Value val, SootField[] appendingFields, Type
 		// Sanity check
 		if (baseType instanceof PrimType) {
 			if (fields != null) {
-				logger.warn("Primitive types cannot have fields");
+				logger.warn("Primitive types cannot have fields: baseType={} fields={}", baseType,
+						Arrays.toString(fields));
 				return null;
 			}
 		}
 		if (fields != null) {
-			for (int i = 0; i < fields.length - 2; i++)
-				if (fields[i].getType() instanceof PrimType) {
-					logger.warn("Primitive types cannot have fields");
+			for (int i = 0; i < fields.length - 2; i++) {
+				SootField f = fields[i];
+				Type fieldType = f.getType();
+				if (fieldType instanceof PrimType) {
+					logger.warn("Primitive types cannot have fields: field={} type={}", f, fieldType);
 					return null;
 				}
+			}
 		}
 
 		return new AccessPath(value, fields, baseType, fieldTypes, taintSubFields, cutOffApproximation, arrayTaintType,

soot-infoflow/src/soot/jimple/infoflow/memory/FlowDroidTimeoutWatcher.java

@@ -2,6 +2,7 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,26 +26,26 @@ public class FlowDroidTimeoutWatcher implements IMemoryBoundedSolverStatusNotifi
 	 *
 	 */
 	private enum SolverState {
-	/**
-	 * The solver has not been started yet
-	 */
-	IDLE,
-	/**
-	 * The solver is running
-	 */
-	RUNNING,
-	/**
-	 * The solver has completed its work
-	 */
-	DONE
+		/**
+		 * The solver has not been started yet
+		 */
+		IDLE,
+		/**
+		 * The solver is running
+		 */
+		RUNNING,
+		/**
+		 * The solver has completed its work
+		 */
+		DONE
 	}
 
 	private final Logger logger = LoggerFactory.getLogger(getClass());
 
 	private final long timeout;
 	private final InfoflowResults results;
 	private final Map<IMemoryBoundedSolver, SolverState> solvers = new ConcurrentHashMap<>();
-	private boolean stopped = false;
+	private volatile boolean stopped = false;
 	private ISolversTerminatedCallback terminationCallback = null;
 
 	/**
@@ -93,7 +94,7 @@ public void addSolver(IMemoryBoundedSolver solver) {
 	 * Starts the timeout watcher
 	 */
 	public void start() {
-		final long startTime = System.currentTimeMillis();
+		final long startTime = System.nanoTime();
 		logger.info("FlowDroid timeout watcher started");
 		this.stopped = false;
 
@@ -103,34 +104,38 @@ public void start() {
 			public void run() {
 				// Sleep until we have reached the timeout
 				boolean allTerminated = isTerminated();
-				long timeElapsed = 0;
 
-				while (!stopped && ((timeElapsed = System.currentTimeMillis() - startTime) < 1000 * timeout)) {
+				long timeoutNano = TimeUnit.SECONDS.toNanos(timeout);
+				while (!stopped && ((System.nanoTime() - startTime) < timeoutNano)) {
 					allTerminated = isTerminated();
-					if (allTerminated)
+					if (allTerminated) {
 						break;
+					}
 
 					try {
 						Thread.sleep(1000);
 					} catch (InterruptedException e) {
 						// There's little we can do here
-
 					}
 				}
+				long timeElapsed = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - startTime);
 
 				// If things have not stopped on their own account, we force
 				// them to
 				if (!stopped & !allTerminated) {
 					logger.warn("Timeout reached, stopping the solvers...");
-					if (results != null)
+					if (results != null) {
 						results.addException("Timeout reached");
+					}
 
-					TimeoutReason reason = new TimeoutReason(timeElapsed / 1000, timeout);
-					for (IMemoryBoundedSolver solver : solvers.keySet())
+					TimeoutReason reason = new TimeoutReason(timeElapsed, timeout);
+					for (IMemoryBoundedSolver solver : solvers.keySet()) {
 						solver.forceTerminate(reason);
+					}
 
-					if (terminationCallback != null)
+					if (terminationCallback != null) {
 						terminationCallback.onSolversTerminated();
+					}
 				}
 
 				logger.info("FlowDroid timeout watcher terminated");