From 762e346922e356de685b83863bf1cababce10a47 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Tue, 30 Apr 2013 17:50:38 +0200
Subject: [PATCH] Removed the update Thread; Added the mirror framework for
easier reflection calls
---
Kieker.WebGUI/lib/mirror-1.6.1.LICENSE | 58 +++++++
Kieker.WebGUI/pom.xml | 5 +
.../webgui/service/impl/util/ACManager.java | 4 +-
.../webgui/service/impl/util/Analysis.java | 156 +++---------------
4 files changed, 92 insertions(+), 131 deletions(-)
create mode 100644 Kieker.WebGUI/lib/mirror-1.6.1.LICENSE
diff --git a/Kieker.WebGUI/lib/mirror-1.6.1.LICENSE b/Kieker.WebGUI/lib/mirror-1.6.1.LICENSE
new file mode 100644
index 00000000..b3c4b689
--- /dev/null
+++ b/Kieker.WebGUI/lib/mirror-1.6.1.LICENSE
@@ -0,0 +1,58 @@
+The Apache Software License - ASL - v2.0
+Project: http://projetos.vidageek.net/mirror/
+Description: Mirror
+License: http://www.apache.org/licenses/LICENSE-2.0.txt
+
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index 7be476bd..7f1069d5 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -45,6 +45,11 @@
</repositories>
<dependencies>
+ <dependency>
+ <groupId>net.vidageek</groupId>
+ <artifactId>mirror</artifactId>
+ <version>1.6.1</version>
+ </dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/ACManager.java b/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/ACManager.java
index 104db1f5..2dd6f4d3 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/ACManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/ACManager.java
@@ -224,7 +224,9 @@ public class ACManager {
}
public void updateDisplays(final String projectName) {
-
+ if (this.analyses.containsKey(projectName)) {
+ this.analyses.get(projectName).updateDisplays();
+ }
}
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/Analysis.java b/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/Analysis.java
index c1fd13bd..6831593f 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/Analysis.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/Analysis.java
@@ -17,11 +17,12 @@
package kieker.webgui.service.impl.util;
import java.io.File;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
+
+import net.vidageek.mirror.dsl.Mirror;
+import net.vidageek.mirror.exception.MirrorException;
import kieker.analysis.AnalysisController;
import kieker.common.logging.Log;
@@ -43,10 +44,12 @@ public class Analysis {
private static final long MAX_THREAD_WAIT_TIME_MS = 1000;
private final ClassAndMethodContainer classAndMethodContainer;
- private final UpdateDisplaysThread updateDisplaysThread;
private final Object analysisController;
private final Object analysisControllerThread;
+ private final Map<String, Map<String, Object>> displayObjects = new HashMap<String, Map<String, Object>>();
+ private final Map<String, Map<String, Method>> displayMethods = new HashMap<String, Map<String, Method>>();
+
/**
* Creates a new instance of this class using the given parameters.
*
@@ -71,8 +74,9 @@ public class Analysis {
controllerAndMapping, null);
this.analysisControllerThread = ClassAndMethodContainer.invokeConstructor(this.classAndMethodContainer.getAnalysisControllerThreadConstructor(),
this.analysisController);
- this.updateDisplaysThread = new UpdateDisplaysThread(); // ClassAndMethodContainer.invokeMethod(
+ // this.updateDisplaysThread = new UpdateDisplaysThread(); // ClassAndMethodContainer.invokeMethod(
// this.classAndMethodContainer.getAnalysisControllerWithMappingGetMapping(), controllerAndMapping, null));
+
if ((this.analysisController == null) || (this.analysisControllerThread == null)) {
throw new AnalysisInitializationException("An error occured while instantiating the analysis.");
}
@@ -90,45 +94,22 @@ public class Analysis {
* If the analysis is in the wrong state to be started.
*/
public void start() throws AnalysisStateException {
- synchronized (this) {
- try {
- this.classAndMethodContainer.getAnalysisControllerThreadStart().invoke(this.analysisControllerThread, new Object[0]);
- this.updateDisplaysThread.start();
- } catch (final IllegalThreadStateException ex) {
- throw new AnalysisStateException("The analysis has already been started once. It has to be reinitialized to be runnable again.", ex);
- } catch (final IllegalAccessException ex) {
- Analysis.LOG.error("An error occured during a reflection method call.", ex);
- } catch (final IllegalArgumentException ex) {
- Analysis.LOG.error("An error occured during a reflection method call.", ex);
- } catch (final InvocationTargetException ex) {
- throw new AnalysisStateException("The analysis has already been started once. It has to be reinitialized to be runnable again.", ex);
- }
+ try {
+ new Mirror().on(this.analysisControllerThread).invoke().method("start").withoutArgs();
+ } catch (final MirrorException ex) {
+ Analysis.LOG.error("An error occured during a reflection method call.", ex);
}
-
}
/**
* Stops the analysis.
*/
public void stop() {
- synchronized (this) {
- try {
- this.classAndMethodContainer.getAnalysisControllerThreadTerminate().invoke(this.analysisControllerThread, new Object[0]);
- this.updateDisplaysThread.terminate();
-
- this.classAndMethodContainer.getAnalysisControllerThreadJoin().invoke(this.analysisControllerThread, Analysis.MAX_THREAD_WAIT_TIME_MS,
- TimeUnit.MILLISECONDS);
- this.updateDisplaysThread.join(Analysis.MAX_THREAD_WAIT_TIME_MS);
- } catch (final InterruptedException ex) {
- // Log the exception, but don't handle it further
- Analysis.LOG.info("An interrupted exception occured.", ex);
- } catch (final IllegalAccessException ex) {
- Analysis.LOG.error("An error occured during a reflection method call.", ex);
- } catch (final IllegalArgumentException ex) {
- Analysis.LOG.error("An error occured during a reflection method call.", ex);
- } catch (final InvocationTargetException ex) {
- Analysis.LOG.error("An error occured during a reflection method call.", ex);
- }
+ try {
+ new Mirror().on(this.analysisControllerThread).invoke().method("terminate").withoutArgs();
+ new Mirror().on(this.analysisControllerThread).invoke().method("join").withArgs(Analysis.MAX_THREAD_WAIT_TIME_MS);
+ } catch (final MirrorException ex) {
+ Analysis.LOG.error("An error occured during a reflection method call.", ex);
}
}
@@ -138,8 +119,11 @@ public class Analysis {
* @return The state.
*/
public Enum<?> getCurrentState() {
- synchronized (this) {
- return (Enum<?>) ClassAndMethodContainer.invokeMethod(this.classAndMethodContainer.getAnalysisControllerGetState(), this.analysisController, null);
+ try {
+ return (Enum<?>) new Mirror().on(this.analysisController).invoke().method("getState").withoutArgs();
+ } catch (final MirrorException ex) {
+ Analysis.LOG.error("An error occured during a reflection method call.", ex);
+ return null;
}
}
@@ -154,7 +138,8 @@ public class Analysis {
* @return A display object for the given parameters.
*/
public Object getDisplay(final String viewName, final String displayName) {
- return this.updateDisplaysThread.getDisplay(viewName, displayName);
+ // return this.updateDisplaysThread.getDisplay(viewName, displayName);
+ return null;
}
/**
@@ -167,96 +152,7 @@ public class Analysis {
AnalysisController.class.getName());
}
- /**
- * This manager is responsible for the currently used and running instances of {@code AnalysisController}. It supplies methods to check the states of analysis,
- * instantiate, start and to stop them.
- *
- * @author Nils Christian Ehmke
- * @version 1.0
- */
- private static class UpdateDisplaysThread extends Thread {
-
- private static final long SLEEP_TIME_MS = 2 * 1000;
- // private final Object pluginMap;
- private final Map<String, Map<String, Object>> displayObjects = new ConcurrentHashMap<String, Map<String, Object>>(); // NOPMD
- // private final Map<Object, Method> methodMap = new ConcurrentHashMap<Object, Method>(); // NOPMD (Use of concurrent hash map)
- private volatile boolean terminated = false;
-
- /**
- * Default constructor.
- */
- public UpdateDisplaysThread() {
- // this.pluginMap = object;
- }
-
- /**
- * Delivers the correct method to be invoked for an update of the display.
- *
- * @param clazz
- * The class of the plugin.
- * @param displayName
- * The name within the display-annotation.
- * @return The method instance.
- */
- /*
- * private Method getDisplayMethod(final Class<? extends AbstractPlugin> clazz, final String displayName) {
- * final Method[] methods = clazz.getMethods();
- * for (final Method method : methods) {
- * try {
- * final Annotation displayAnnot = method.getAnnotation(Analysis.this.classAndMethodContainer.getDisplayAnnotationClass());
- * if ((displayAnnot != null)
- * && (Analysis.this.classAndMethodContainer.getDisplayNameMethod().invoke(displayAnnot, new Object[0]).equals(displayName))) {
- * // We found the correct method
- * return method;
- * }
- * } catch (final IllegalAccessException ex) {
- * // Log this exception, but ignore it
- * Analysis.LOG.info("An error occured while calling a method.", ex);
- * } catch (final IllegalArgumentException ex) {
- * // Log this exception, but ignore it
- * Analysis.LOG.info("An error occured while calling a method.", ex);
- * } catch (final InvocationTargetException ex) {
- * // Log this exception, but ignore it
- * Analysis.LOG.info("An error occured while calling a method.", ex);
- * }
- * }
- * return null;
- * }
- */
-
- /**
- * Delivers the display object for the given view and the given display.
- *
- * @param viewName
- * The name of the view.
- * @param displayName
- * The name of the display in the view.
- * @return The object for the given display if it exists, null otherwise.
- */
- public Object getDisplay(final String viewName, final String displayName) {
- return this.displayObjects.get(viewName).get(displayName);
- }
-
- @Override
- public void run() {
- // Run until we final have been interrupted
- while (!this.terminated) {
- // Wait a little bit.
- try {
- Thread.sleep(UpdateDisplaysThread.SLEEP_TIME_MS);
- } catch (final InterruptedException ex) {
- // We have been interrupted. Exit the thread
- return;
- }
- }
+ public void updateDisplays() {
- }
-
- /**
- * This method makes sure that the thread terminates at the next possible point.
- */
- public void terminate() {
- this.terminated = true;
- }
}
}
--
GitLab