Skip to content
Snippets Groups Projects
Commit 72beb5dd authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

#987; Removed some bugs; Corrected one of the examples

parent aedaf5aa
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 6595 additions and 28 deletions
Kieker.WebGUI/bin/Kieker.WebGUI.bat
+ 6
− 1
View file @ 72beb5dd
@echo off
REM @author Nils Christian Ehmke
java -XX:PermSize=256M -XX:MaxPermSize=512M -Xms128M -Xmx256M -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -jar ..\lib\jetty-runner-8.1.9.v20130131.jar --path /Kieker.WebGUI ..\target\Kieker.WebGUI-*.war
set BIN_PATH_ABS=%~dp0
cd %BIN_PATH_ABS%
java -XX:PermSize=256M -XX:MaxPermSize=512M -Xms128M -Xmx256M -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -jar ../lib/jetty-runner-8.1.9.v20130131.jar --path /Kieker.WebGUI ../target/Kieker.WebGUI-*.war
@echo on
Kieker.WebGUI/bin/Kieker.WebGUI.sh
+ 4
− 0
View file @ 72beb5dd
......@@ -2,4 +2,8 @@
# @author Nils Christian Ehmke
BINDIR=$(cd "$(dirname "$0")"; pwd)/
cd ${BINDIR}
java -XX:PermSize=256M -XX:MaxPermSize=512M -Xms128M -Xmx256M -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -jar ../lib/jetty-runner-8.1.9.v20130131.jar --path /Kieker.WebGUI ../target/Kieker.WebGUI-*.war
\ No newline at end of file
Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax
+ 26
− 16
View file @ 72beb5dd
<?xml version="1.0" encoding="UTF-8"?>
<Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="platform:/resource/Kieker/model/AnalysisMetaModel.ecore" name="AnalysisProject">
<plugins xsi:type="Reader" name="FSReader" classname="kieker.analysis.plugin.reader.filesystem.FSReader">
<plugins xsi:type="Reader" name="File System Reader" classname="kieker.analysis.plugin.reader.filesystem.FSReader">
<properties name="ignoreUnknownRecordTypes" value="true"/>
<properties name="inputDirs" value="data/Bookstore-Example/testdata"/>
<properties name="inputDirs" value="data/Advanced Example/testdata"/>
<outputPorts name="monitoringRecords" subscribers="//@plugins.1/@inputPorts.0"/>
</plugins>
<plugins xsi:type="Filter" name="StringBufferFilter" classname="kieker.analysis.plugin.filter.forward.StringBufferFilter">
<plugins xsi:type="Filter" name="String Buffer Filter" classname="kieker.analysis.plugin.filter.forward.StringBufferFilter">
<outputPorts name="relayed-events" subscribers="//@plugins.2/@inputPorts.3 //@plugins.2/@inputPorts.2"/>
<inputPorts name="received-events"/>
</plugins>
<plugins xsi:type="Filter" name="TimestampFilter" classname="kieker.analysis.plugin.filter.select.TimestampFilter">
<plugins xsi:type="Filter" name="Timestamp Filter" classname="kieker.analysis.plugin.filter.select.TimestampFilter">
<properties name="timeunit" value="NANOSECONDS"/>
<properties name="ignoreAfterTimestamp" value="9223372036854775807"/>
<properties name="ignoreBeforeTimestamp" value="0"/>
<outputPorts name="recordsWithinTimePeriod" subscribers="//@plugins.3/@inputPorts.0"/>
......@@ -19,7 +20,7 @@
<inputPorts name="monitoringRecordsFlow"/>
<inputPorts name="monitoringRecordsExecution"/>
</plugins>
<plugins xsi:type="Filter" name="TraceIdFilter" classname="kieker.analysis.plugin.filter.trace.TraceIdFilter">
<plugins xsi:type="Filter" name="Trace ID Filter" classname="kieker.analysis.plugin.filter.select.TraceIdFilter">
<properties name="selectedTraceIds" value=""/>
<properties name="acceptAllTraces" value="true"/>
<outputPorts name="recordsMatchingId" subscribers="//@plugins.4/@inputPorts.0 //@plugins.6/@inputPorts.0"/>
......@@ -28,44 +29,53 @@
<inputPorts name="monitoringRecordsFlow"/>
<inputPorts name="monitoringRecordsExecution"/>
</plugins>
<plugins xsi:type="Filter" name="Execution record transformation" classname="kieker.tools.traceAnalysis.filter.executionRecordTransformation.ExecutionRecordTransformationFilter">
<plugins xsi:type="Filter" name="Execution Record Transformation" classname="kieker.tools.traceAnalysis.filter.executionRecordTransformation.ExecutionRecordTransformationFilter">
<repositories name="systemModelRepository" repository="//@repositories.0"/>
<outputPorts name="transformedExecutions" subscribers="//@plugins.5/@inputPorts.0"/>
<inputPorts name="operationExecutionRecords"/>
</plugins>
<plugins xsi:type="Filter" name="Trace reconstruction (execution records -> execution traces)" classname="kieker.tools.traceAnalysis.filter.traceReconstruction.TraceReconstructionFilter">
<properties name="maxTraceDurationMillis" value="600000"/>
<properties name="timeunit" value="NANOSECONDS"/>
<properties name="ignoreInvalidTraces" value="false"/>
<properties name="maxTraceDuration" value="600000000000"/>
<repositories name="systemModelRepository" repository="//@repositories.0"/>
<outputPorts name="messageTraces" subscribers="//@plugins.8/@inputPorts.0"/>
<outputPorts name="messageTraces" subscribers="//@plugins.9/@inputPorts.0"/>
<outputPorts name="executionTraces"/>
<outputPorts name="invalidExecutionTraces"/>
<inputPorts name="executions"/>
</plugins>
<plugins xsi:type="Filter" name="Trace reconstruction (trace event records -> event record traces)" classname="kieker.analysis.plugin.filter.flow.EventRecordTraceReconstructionFilter">
<properties name="timeunit" value="NANOSECONDS"/>
<properties name="maxTraceTimeout" value="9223372036854775807"/>
<properties name="maxTraceDuration" value="600000"/>
<outputPorts name="validTraces" subscribers="//@plugins.7/@inputPorts.0"/>
<outputPorts name="invalidTraces"/>
<properties name="maxTraceDuration" value="600000000000"/>
<outputPorts name="validTraces" subscribers="//@plugins.7/@inputPorts.0 //@plugins.8/@inputPorts.0"/>
<outputPorts name="invalidTraces" subscribers="//@plugins.7/@inputPorts.1"/>
<inputPorts name="traceRecords"/>
</plugins>
<plugins xsi:type="Filter" name="Trace reconstruction (event records -> event record traces)" classname="kieker.tools.traceAnalysis.filter.flow.EventRecordTraceCounter">
<properties name="logInvalidTraces" value="true"/>
<inputPorts name="validEventRecordTraces"/>
<inputPorts name="invalidEventRecordTraces"/>
</plugins>
<plugins xsi:type="Filter" name="Trace reconstruction (event record traces -> execution traces)" classname="kieker.tools.traceAnalysis.filter.flow.TraceEventRecords2ExecutionAndMessageTraceFilter">
<properties name="enhanceJavaConstructors" value="true"/>
<properties name="enhanceCallDetection" value="true"/>
<repositories name="systemModelRepository" repository="//@repositories.0"/>
<outputPorts name="executionTrace"/>
<outputPorts name="messageTrace" subscribers="//@plugins.8/@inputPorts.0"/>
<outputPorts name="messageTrace" subscribers="//@plugins.9/@inputPorts.0"/>
<outputPorts name="invalidTrace"/>
<inputPorts name="traceEvents"/>
</plugins>
<plugins xsi:type="Filter" name="Trace call trees" classname="kieker.tools.traceAnalysis.filter.visualization.callTree.TraceCallTreeFilter">
<plugins xsi:type="Filter" name="Aggregated call tree (deployment level)" classname="kieker.tools.traceAnalysis.filter.visualization.callTree.AggregatedAllocationComponentOperationCallTreeFilter">
<properties name="shortLabels" value="false"/>
<properties name="dotOutputFn" value="C:\HiWi\kieker (working copy)\bin\out\callTree"/>
<properties name="includeWeights" value="true"/>
<properties name="dotOutputFn" value="data/aggregatedDeploymentCallTree.dot"/>
<repositories name="systemModelRepository" repository="//@repositories.0"/>
<inputPorts name="messageTraces"/>
</plugins>
<plugins xsi:type="Filter" name="SystemModel2FileFilter" classname="kieker.tools.traceAnalysis.filter.systemModel.SystemModel2FileFilter">
<properties name="outputFnHtml" value="system-entities.html"/>
<properties name="outputFnHtml" value="data/system-entities.html"/>
<repositories name="systemModelRepository" repository="//@repositories.0"/>
</plugins>
<repositories name="SystemModelRepository" classname="kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository"/>
<repositories name="System Model Repository" classname="kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository"/>
</Project>
Kieker.WebGUI/bin/data/Advanced Example/meta.dat
+ 2
− 2
View file @ 72beb5dd
#
#Fri Apr 12 21:00:01 CEST 2013
#Tue Apr 30 13:11:52 CEST 2013
owner=admin
last\ user=admin
analysis\ layout=id0 -567 -144 192 72;id1 -271 -144 312 72;id2 87 -155 276 132;id3 395 -143 252 108;id4 1091 -155 468 96;id5 1949 -108 816 144;id6 1023 104 876 84;id7 1945 92 840 120;id8 2613 122 288 72;id9 2607 -180 360 72;id10 3025 -180 348 72;\#id1.2 id2.6 -83.5 -132.5 -83.5 -107.5;id1.2 id2.5 -83.5 -132.5 -83.5 -131.5;id3.12 id6.20 552.5 -143.5 552.5 115.5;id4.0 id10.R 1492.5 -161.5 1492.5 -262.5 2818.5 -262.5 2818.5 -168.5;id4.15 id5.16 1492.5 -125.5 1492.5 -96.5;id5.1 id10.R 2396.5 -138.5 2396.5 -262.5 2818.5 -262.5 2818.5 -168.5;id5.17 id8.26 2406.5 -102.5 2406.5 133.5;id7.2 id10.R 2396.5 73.5 2396.5 -99.5 2818.5 -99.5 2818.5 -168.5;id8.3 id10.R 2818.5 133.5 2818.5 -168.5;
analysis\ layout=id0 -3839 -1470 312 72;id1 -3471 -1470 336 72;id2 -3095 -1476 288 132;id3 -2749 -1464 276 108;id4 -2041 -1479 468 96;id5 -1173 -1461 816 144;id6 -2109 -1225 876 84;id7 -1195 -1073 804 84;id8 -1177 -1237 840 144;id9 -411 -1394 564 72;id10 -309 -1509 360 72;id11 121 -1488 372 72;\#id1.2 id2.6 -3273.5 -1460.5 -3273.5 -1430.5;id1.2 id2.5 -3273.5 -1460.5 -3273.5 -1454.5;id3.12 id4.14 -2581.5 -1466.5 -2581.5 -1469.5;id3.12 id6.20 -2581.5 -1466.5 -2581.5 -1215.5;id4.0 id11.R -1641.5 -1487.5 -1641.5 -1617.5 -99.5 -1617.5 -99.5 -1478.5;id5.1 id11.R -727.5 -1493.5 -727.5 -1478.5;id5.17 id9.29 -727.5 -1457.5 -727.5 -1384.5;id6.21 id7.23 -1631.5 -1227.5 -1631.5 -1075.5;id6.22 id7.24 -1641.5 -1203.5 -1641.5 -1051.5;id8.2 id11.R -99.5 -1269.5 -99.5 -1478.5;id8.27 id9.29 -727.5 -1209.5 -727.5 -1384.5;id9.3 id11.R -99.5 -1384.5 -99.5 -1478.5;id10.4 id11.R -99.5 -1499.5 -99.5 -1478.5;
Kieker.WebGUI/bin/data/Advanced Example/testdata/kieker.map 0 → 100644
+ 1
− 0
View file @ 72beb5dd
$0=kieker.common.record.OperationExecutionRecord
Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/util/Analysis.java
+ 3
− 1
View file @ 72beb5dd
......@@ -21,6 +21,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import kieker.analysis.AnalysisController;
import kieker.common.logging.Log;
......@@ -115,7 +116,8 @@ public class Analysis {
this.classAndMethodContainer.getAnalysisControllerThreadTerminate().invoke(this.analysisControllerThread, new Object[0]);
this.updateDisplaysThread.terminate();
this.classAndMethodContainer.getAnalysisControllerThreadJoin().invoke(this.analysisControllerThread, Analysis.MAX_THREAD_WAIT_TIME_MS);
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
......
Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorGraphBean.java
+ 13
− 8
View file @ 72beb5dd
......@@ -387,15 +387,20 @@ public class CurrentAnalysisEditorGraphBean {
final Map<String, String> paramMap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
final String clickedNodeID = paramMap.get(CurrentAnalysisEditorGraphBean.PARAM_NAME_ID);
// Now search the correct node
try {
final MIAnalysisComponent selectedNode = this.componentMap.get(Integer.parseInt(clickedNodeID.substring(2)));
if ((selectedNode != null) && (this.currentAnalysisEditorBean != null)) {
this.currentAnalysisEditorBean.nodeSelected(selectedNode);
if (clickedNodeID.isEmpty()) {
// Deselect
this.currentAnalysisEditorBean.nodeSelected(null);
} else {
// Now search the correct node
try {
final MIAnalysisComponent selectedNode = this.componentMap.get(Integer.parseInt(clickedNodeID.substring(2)));
if ((selectedNode != null) && (this.currentAnalysisEditorBean != null)) {
this.currentAnalysisEditorBean.nodeSelected(selectedNode);
}
} catch (final NumberFormatException ex) {
// Ignore an invalid ID, but log it.
CurrentAnalysisEditorGraphBean.LOG.info("Invalid ID", ex);
}
} catch (final NumberFormatException ex) {
// Ignore an invalid ID, but log it.
CurrentAnalysisEditorGraphBean.LOG.info("Invalid ID", ex);
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment