Added choice for MonitoredClass

* updatedheader to 2014
* fixed typo

README

-The MooBench Monitoring OVerhead Benchmark
+The MooBench Monitoring Overhead Benchmark
 ------------------------------------------
 
 This micro-benchmarks can be used to quantify the performance

frameworks/Kieker/src/kieker/Logger.java

 /***************************************************************************
- * Copyright 2013 Kieker Project (http://kieker-monitoring.net)
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

frameworks/Kieker/src/kieker/tcp/TestExperiment1.java

 /***************************************************************************
- * Copyright 2013 Kieker Project (http://kieker-monitoring.net)
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

frameworks/Kieker/src/kieker/tcp/TestExperiment2.java

 /***************************************************************************
- * Copyright 2013 Kieker Project (http://kieker-monitoring.net)
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

frameworks/Kieker/src/kieker/tcp/TestExperiment3.java

 /***************************************************************************
- * Copyright 2013 Kieker Project (http://kieker-monitoring.net)
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/mooBench/benchmark/Benchmark.java

 /***************************************************************************
- * Copyright 2013 Kieker Project (http://kieker-monitoring.net)
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 
 import mooBench.monitoredApplication.MonitoredClass;
+import mooBench.monitoredApplication.MonitoredClassThreaded;
 
 /**
  * @author Jan Waller
@@ -44,6 +45,7 @@ public final class Benchmark {
 	private static long methodTime = 0;
 	private static int recursionDepth = 0;
 	private static boolean quickstart = false;
+	private static MonitoredClass mc = null;
 
 	private Benchmark() {}
 
@@ -61,10 +63,9 @@ public final class Benchmark {
 
 		// 2. Initialize Threads and Classes
 		final CountDownLatch doneSignal = new CountDownLatch(Benchmark.totalThreads);
-		final MonitoredClass mc = new MonitoredClass();
 		final BenchmarkingThread[] threads = new BenchmarkingThread[Benchmark.totalThreads];
 		for (int i = 0; i < Benchmark.totalThreads; i++) {
-			threads[i] = new BenchmarkingThread(mc, Benchmark.totalCalls, Benchmark.methodTime, Benchmark.recursionDepth, doneSignal);
+			threads[i] = new BenchmarkingThread(Benchmark.mc, Benchmark.totalCalls, Benchmark.methodTime, Benchmark.recursionDepth, doneSignal);
 			threads[i].setName(String.valueOf(i + 1));
 		}
 		if (!quickstart) {
@@ -137,6 +138,9 @@ public final class Benchmark {
 		cmdlOpts.addOption(OptionBuilder.withLongOpt("runnable").withArgName("classname").hasArg(true).isRequired(false)
 				.withDescription("Class implementing the Runnable interface. run() method is executed before the benchmark starts.").withValueSeparator('=')
 				.create("r"));
+		cmdlOpts.addOption(OptionBuilder.withLongOpt("application").withArgName("classname").hasArg(true).isRequired(false)
+				.withDescription("Class implementing the MonitoredClass interface.").withValueSeparator('=')
+				.create("a"));
 		try {
 			CommandLine cmdl = null;
 			final CommandLineParser cmdlParser = new BasicParser();
@@ -148,6 +152,12 @@ public final class Benchmark {
 			Benchmark.recursionDepth = Integer.parseInt(cmdl.getOptionValue("recursiondepth"));
 			Benchmark.quickstart = cmdl.hasOption("quickstart");
 			Benchmark.ps = new PrintStream(new BufferedOutputStream(new FileOutputStream(Benchmark.outputFn, true), 8192 * 8), false, Benchmark.ENCODING);
+			final String application = cmdl.getOptionValue("application");
+			if (null != application) {
+				mc = ((MonitoredClass) Class.forName(application).newInstance());
+			} else {
+				mc = new MonitoredClassThreaded();
+			}
 			final String clazzname = cmdl.getOptionValue("runnable");
 			if (null != clazzname) {
 				((Runnable) Class.forName(clazzname).newInstance()).run();

src/mooBench/benchmark/BenchmarkingThread.java

 /***************************************************************************
- * Copyright 2013 Kieker Project (http://kieker-monitoring.net)
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/mooBench/monitoredApplication/MonitoredClass.java

 /***************************************************************************
- * Copyright 2013 Kieker Project (http://kieker-monitoring.net)
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,32 +16,10 @@
 
 package mooBench.monitoredApplication;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
-
 /**
  * @author Jan Waller
  */
-public final class MonitoredClass {
-	private final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+public interface MonitoredClass {
 
-	/**
-	 * Default constructor.
-	 */
-	public MonitoredClass() {
-		// empty default constructor
-	}
-
-	public final long monitoredMethod(final long methodTime, final int recDepth) {
-		if (recDepth > 1) {
-			return this.monitoredMethod(methodTime, recDepth - 1);
-		} else {
-			final long exitTime = this.threadMXBean.getCurrentThreadUserTime() + methodTime;
-			long currentTime;
-			do {
-				currentTime = this.threadMXBean.getCurrentThreadUserTime();
-			} while (currentTime < exitTime);
-			return currentTime;
-		}
-	}
+	public long monitoredMethod(final long methodTime, final int recDepth);
 }

src/mooBench/monitoredApplication/MonitoredClassSimple.java

+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package mooBench.monitoredApplication;
+
+/**
+ * @author Jan Waller
+ */
+public final class MonitoredClassSimple implements MonitoredClass {
+
+	/**
+	 * Default constructor.
+	 */
+	public MonitoredClassSimple() {
+		// empty default constructor
+	}
+
+	public final long monitoredMethod(final long methodTime, final int recDepth) {
+		if (recDepth > 1) {
+			return this.monitoredMethod(methodTime, recDepth - 1);
+		} else {
+			final long exitTime = System.nanoTime() + methodTime;
+			long currentTime;
+			do {
+				currentTime = System.nanoTime();
+			} while (currentTime < exitTime);
+			return currentTime;
+		}
+	}
+}

src/mooBench/monitoredApplication/MonitoredClassThreaded.java

+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package mooBench.monitoredApplication;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadMXBean;
+
+/**
+ * @author Jan Waller
+ */
+public final class MonitoredClassThreaded implements MonitoredClass {
+	final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+
+	/**
+	 * Default constructor.
+	 */
+	public MonitoredClassThreaded() {
+		// empty default constructor
+	}
+
+	public final long monitoredMethod(final long methodTime, final int recDepth) {
+		if (recDepth > 1) {
+			return this.monitoredMethod(methodTime, recDepth - 1);
+		} else {
+			final long exitTime = this.threadMXBean.getCurrentThreadUserTime() + methodTime;
+			long currentTime;
+			do {
+				currentTime = this.threadMXBean.getCurrentThreadUserTime();
+			} while (currentTime < exitTime);
+			return currentTime;
+		}
+	}
+}