Merge pull request #356 from MarcMil/dev-experimental

Introducing ThreadUtils

Author: StevenArzt

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

@@ -10,6 +10,7 @@
 import soot.jimple.infoflow.memory.IMemoryBoundedSolver.IMemoryBoundedSolverStatusNotification;
 import soot.jimple.infoflow.memory.reasons.TimeoutReason;
 import soot.jimple.infoflow.results.InfoflowResults;
+import soot.jimple.infoflow.util.ThreadUtils;
 
 /**
  * Class for enforcing timeouts on IFDS solvers
@@ -98,7 +99,7 @@ public void start() {
 		logger.info("FlowDroid timeout watcher started");
 		this.stopped = false;
 
-		new Thread(new Runnable() {
+		ThreadUtils.createGenericThread(new Runnable() {
 
 			@Override
 			public void run() {
@@ -155,7 +156,7 @@ private boolean isTerminated() {
 				return allTerminated;
 			}
 
-		}, "FlowDroid Timeout Watcher").start();
+		}, "FlowDroid Timeout Watcher", true).start();
 	}
 
 	/**

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

@@ -24,6 +24,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import soot.jimple.infoflow.util.ThreadUtils;
+
 /**
  * Notification system that triggers a callback when the JVM is about to run out
  * of memory. Inspired by code from
@@ -204,7 +206,7 @@ public void setWarningThreshold(double percentage) {
 			if (useOwnImplementation) {
 				// No JVM support is available, use our own implementation
 				if (thrLowMemoryWarningThread == null) {
-					thrLowMemoryWarningThread = new Thread(new Runnable() {
+					thrLowMemoryWarningThread = ThreadUtils.createGenericThread(new Runnable() {
 
 						@Override
 						public void run() {
@@ -251,9 +253,7 @@ public void run() {
 							}
 						}
 
-					});
-					thrLowMemoryWarningThread.setName("Low memory monitor");
-					thrLowMemoryWarningThread.setDaemon(true);
+					}, "Low memory monitor", true);
 					thrLowMemoryWarningThread.setPriority(Thread.MIN_PRIORITY);
 					thrLowMemoryWarningThread.start();
 				}

soot-infoflow/src/soot/jimple/infoflow/util/ThreadUtils.java

@@ -0,0 +1,43 @@
+package soot.jimple.infoflow.util;
+
+/**
+ * This class can be used to create threads.
+ * Own implementations may provide their own factory if they wish.
+ */
+public class ThreadUtils {
+	/**
+	 * Can be used to create threads
+	 */
+	public static interface IThreadFactory {
+		/**
+		 * Adds a thread which is generic, i.e. not necessary tied to a specific soot instance.
+		 * @param r the runnable
+		 * @param name the name of the thread
+		 * @param daemon whether the thread is a daemon
+		 * @return the thread
+		 */
+		public Thread createGenericThread(Runnable r, String name, boolean daemon);
+	}
+
+	public static IThreadFactory threadFactory = new IThreadFactory() {
+
+		@Override
+		public Thread createGenericThread(Runnable r, String name, boolean daemon) {
+			Thread thr = new Thread(r, name);
+			thr.setDaemon(daemon);
+			return thr;
+		}
+
+	};
+
+	/**
+	 * Adds a thread which is generic, i.e. not necessary tied to a specific soot instance.
+	 * @param r the runnable
+	 * @param name the name of the thread
+	 * @param daemon whether the thread is a daemon
+	 * @return the thread
+	 */
+	public static Thread createGenericThread(Runnable r, String name, boolean daemon) {
+		return threadFactory.createGenericThread(r, name, daemon);
+	}
+}