Merge branch 'master' of build.se.informatik.uni-kiel.de:chw/teetime (0bd32903) · Commits · TeeTime / Kieker-TeeTime-Stages

Commit 0bd32903 authored 10 years ago by Nelson Tavares de Sousa

Merge branch 'master' of build.se.informatik.uni-kiel.de:chw/teetime

Conflicts:
	src/main/java/teetime/framework/pipe/PipeFactory.java

parents 81420e90 7c362201

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

experiments/scripts/benchmark-kieker-days-kieker.sh 0 additions, 0 deletions

experiments/scripts/benchmark-kieker-days-kieker.sh
experiments/scripts/benchmark-kieker-days-teetime.sh 0 additions, 0 deletions

experiments/scripts/benchmark-kieker-days-teetime.sh
experiments/scripts/teetime-cmd/lib/kieker-1.9_aspectj.jar 0 additions, 0 deletions

experiments/scripts/teetime-cmd/lib/kieker-1.9_aspectj.jar
experiments/scripts/teetime-cmd/startTeetime.cmd 0 additions, 0 deletions

experiments/scripts/teetime-cmd/startTeetime.cmd
experiments/scripts/teetime-cmd/startTeetime.sh 0 additions, 0 deletions

experiments/scripts/teetime-cmd/startTeetime.sh
experiments/scripts/teetime-cmd/teetime.jar 0 additions, 0 deletions

experiments/scripts/teetime-cmd/teetime.jar
src/main/java/teetime/framework/pipe/IPipeFactory.java 7 additions, 0 deletions

src/main/java/teetime/framework/pipe/IPipeFactory.java
src/main/java/teetime/framework/pipe/PipeFactory.java 1 addition, 19 deletions

src/main/java/teetime/framework/pipe/PipeFactory.java
src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java 13 additions, 13 deletions

...eetime/examples/ChwHomeComparisonMethodcallWithPorts.java
src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java 13 additions, 13 deletions

...eetime/examples/ChwWorkComparisonMethodcallWithPorts.java
src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java 13 additions, 13 deletions

...eetime/examples/NieWorkComparisonMethodcallWithPorts.java
src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java 1 addition, 1 deletion

...eetime/examples/experiment01/ChwHomePerformanceCheck.java
src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java 1 addition, 1 deletion

...eetime/examples/experiment01/ChwWorkPerformanceCheck.java
src/performancetest/java/teetime/examples/experiment14/MethodCallThroughputAnalysis14.java 9 additions, 11 deletions

...examples/experiment14/MethodCallThroughputAnalysis14.java
src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java 3 additions, 3 deletions

...eetime/examples/experiment16/ChwHomePerformanceCheck.java
src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java 3 additions, 3 deletions

...eetime/examples/experiment16/ChwWorkPerformanceCheck.java
src/performancetest/java/teetime/examples/experiment19/MethodCallThoughputTimestampAnalysis19Test.java 3 additions, 3 deletions

...eriment19/MethodCallThoughputTimestampAnalysis19Test.java
src/performancetest/java/teetime/examples/loopStage/LoopStageAnalysisConfiguration.java 6 additions, 2 deletions

...me/examples/loopStage/LoopStageAnalysisConfiguration.java
src/performancetest/java/teetime/examples/traceReconstructionWithThreads/ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java 1 addition, 1 deletion

...ChwWorkTcpTraceReconstructionAnalysisWithThreadsTest.java
src/performancetest/java/teetime/runtime/typeCheck/ConnectionTypeTest.java 7 additions, 8 deletions

...st/java/teetime/runtime/typeCheck/ConnectionTypeTest.java

with 81 additions and 91 deletions

Please register or to comment