Merge remote-tracking branch 'origin/merged-prod-cons'
Conflicts: src/main/java/teetime/framework/AbstractStage.java src/main/java/teetime/framework/RunnableStage.java
Showing
- .settings/edu.umd.cs.findbugs.core.prefs 1 addition, 1 deletion.settings/edu.umd.cs.findbugs.core.prefs
- src/main/java/teetime/framework/AbstractStage.java 18 additions, 2 deletionssrc/main/java/teetime/framework/AbstractStage.java
- src/main/java/teetime/framework/Analysis.java 3 additions, 3 deletionssrc/main/java/teetime/framework/Analysis.java
- src/main/java/teetime/framework/AnalysisConfiguration.java 39 additions, 6 deletionssrc/main/java/teetime/framework/AnalysisConfiguration.java
- src/main/java/teetime/framework/ProducerStage.java 3 additions, 9 deletionssrc/main/java/teetime/framework/ProducerStage.java
- src/main/java/teetime/framework/RunnableStage.java 2 additions, 2 deletionssrc/main/java/teetime/framework/RunnableStage.java
- src/main/java/teetime/framework/Stage.java 1 addition, 1 deletionsrc/main/java/teetime/framework/Stage.java
- src/main/java/teetime/framework/Terminable.java 5 additions, 2 deletionssrc/main/java/teetime/framework/Terminable.java
- src/main/java/teetime/framework/TerminationStrategy.java 5 additions, 0 deletionssrc/main/java/teetime/framework/TerminationStrategy.java
- src/main/java/teetime/stage/Clock.java 6 additions, 0 deletionssrc/main/java/teetime/stage/Clock.java
- src/main/java/teetime/stage/io/File2ByteArray.java 2 additions, 2 deletionssrc/main/java/teetime/stage/io/File2ByteArray.java
- src/performancetest/java/teetime/examples/experiment09/MethodCallThroughputAnalysis9.java 2 additions, 2 deletions.../examples/experiment09/MethodCallThroughputAnalysis9.java
- src/performancetest/java/teetime/examples/experiment11/MethodCallThroughputAnalysis11.java 2 additions, 2 deletions...examples/experiment11/MethodCallThroughputAnalysis11.java
- src/performancetest/java/teetime/examples/experiment14/MethodCallThroughputAnalysis14.java 2 additions, 2 deletions...examples/experiment14/MethodCallThroughputAnalysis14.java
- src/performancetest/java/teetime/examples/experiment15/MethodCallThroughputAnalysis15.java 2 additions, 2 deletions...examples/experiment15/MethodCallThroughputAnalysis15.java
- src/performancetest/java/teetime/framework/OldHeadPipeline.java 1 addition, 1 deletion...rformancetest/java/teetime/framework/OldHeadPipeline.java
- src/performancetest/java/teetime/framework/OldPipeline.java 18 additions, 0 deletionssrc/performancetest/java/teetime/framework/OldPipeline.java
- src/test/java/teetime/framework/AnalysisConfigurationTest.java 33 additions, 0 deletions...est/java/teetime/framework/AnalysisConfigurationTest.java
Loading
Please register or sign in to comment