hg: code-tools/jmh: 15 new changesets

aleksey.shipilev at oracle.com aleksey.shipilev at oracle.com
Wed Jun 5 05:14:04 PDT 2013 

Changeset: 08762bbbb164
Author:    shade
Date:      2013-06-03 12:47 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/08762bbbb164

Minor touchup in DeadCodeBench

! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java

Changeset: 2256f5d6d057
Author:    shade
Date:      2013-06-03 14:52 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/2256f5d6d057

Initial change to support benchmark types.

! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java
+ jmh-core/src/main/java/org/openjdk/jmh/annotations/DefaultMode.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MethodGroup.java

Changeset: 5720d6288d56
Author:    shade
Date:      2013-06-04 13:18 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/5720d6288d56

jmh-core-it: @GMB -> @BenchmarkMode

! jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountCmdTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/SingleShotTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/BlackholeApiTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/GroupLabelTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleBenchmarkStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleExecGroupStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleGroupStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleThreadStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/OperationsPerInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPClassTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPMethodTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/blackhole/BlackholeTypesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkBenchExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkStateExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupBenchExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupStateExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadBenchExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadStateExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedClassForkedTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest2.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmAppendPrependArgsTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmArgsTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkBenchOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkStateOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupBenchOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupStateOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadBenchOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadStateOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateIterationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateRunTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateIterationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateRunTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateIterationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateRunTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkBenchSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkStateSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupBenchSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupStateSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadBenchSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadStateSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkBenchHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkStateHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupBenchHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupStateHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadBenchHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadStateHelperTimesTest.java

Changeset: 8e00ee4713e8
Author:    shade
Date:      2013-06-04 13:25 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/8e00ee4713e8

Always initialize Scope.Benchmark objects: @TearDown may be called already.

! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/StateObjectHandler.java

Changeset: d1e165fb0892
Author:    shade
Date:      2013-06-04 13:28 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/d1e165fb0892

jmh-core: @GMB -> @BenchmarkMode

+ jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkMode.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkType.java
- jmh-core/src/main/java/org/openjdk/jmh/annotations/DefaultMode.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/GenerateMicroBenchmark.java
! jmh-core/src/main/java/org/openjdk/jmh/logic/results/IterationData.java
! jmh-core/src/main/java/org/openjdk/jmh/output/format/CsvFormat.java
! jmh-core/src/main/java/org/openjdk/jmh/output/format/OutputFormat.java
! jmh-core/src/main/java/org/openjdk/jmh/output/format/PrettyPrintFormat.java
! jmh-core/src/main/java/org/openjdk/jmh/output/format/SilentFormat.java
! jmh-core/src/main/java/org/openjdk/jmh/output/format/TextReportFormat.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MethodGroup.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MicroBenchmarkProcessor.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/BaseMicroBenchmarkHandler.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/BaseRunner.java
+ jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/ForkedRunner.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/LoopMicroBenchmarkHandler.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkHandler.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkHandlers.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkList.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/ShotMicroBenchmarkHandler.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/options/HarnessOptions.java
+ jmh-core/src/main/java/org/openjdk/jmh/runner/options/handlers/BenchmarkTypeOptionHandler.java
! jmh-core/src/test/java/org/openjdk/jmh/runner/TestMicroBenchmarkList.java
! jmh-core/src/test/resources/org/openjdk/jmh/runner/MicroBenchmarks

Changeset: 17dd93b91f6d
Author:    shade
Date:      2013-06-04 13:29 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/17dd93b91f6d

jmh-core-benchmarks: @GMB -> @BenchmarkMode

! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/BlackholeBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelInvocationBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelIterationBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelTrialBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/NanotimeBench.java

Changeset: 538e773eb07b
Author:    shade
Date:      2013-06-04 13:40 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/538e773eb07b

jmh-samples: @GMB -> @BenchmarkMode

+ jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java
- jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkTypes.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java

Changeset: ef0e8692fe0e
Author:    shade
Date:      2013-06-04 13:44 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/ef0e8692fe0e

BenchmarkType -> Mode.

! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/BlackholeBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelInvocationBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelIterationBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/LevelTrialBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/NanotimeBench.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountCmdTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/SingleShotTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/BlackholeApiTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/GroupLabelTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleBenchmarkStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleExecGroupStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleGroupStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/MultipleThreadStateTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/OperationsPerInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPClassTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/StrictFPMethodTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/blackhole/BlackholeTypesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkBenchExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/BenchmarkStateExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupBenchExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/GroupStateExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadBenchExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/compile/exceptions/ThreadStateExceptionSignaturesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingBenchmarkStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingForkedTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingGroupStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadBenchTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/FailingThreadStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractBenchmarkStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractGroupStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/AbstractThreadStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritBenchmarkStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritGroupStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadBenchTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateSetupTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fails/inherit/InheritThreadStateTearDownTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedClassForkedTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/AnnotatedForkedTest2.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmAppendPrependArgsTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmArgsTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_D_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F0_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F1_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_D_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F0_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F1_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/override/ForkOverride_F_F_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkBenchOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/BenchmarkStateOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupBenchOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/GroupStateOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadBenchOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/interorder/ThreadStateOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkBenchTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/BenchmarkStateTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupBenchTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/GroupStateTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadBenchTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateSetupOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/intraorder/ThreadStateTearDownOrderTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateIterationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceBenchmarkStateRunTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateIterationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceGroupStateRunTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateInvocationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateIterationTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/races/RaceThreadStateRunTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadBenchSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadStateSharingTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkBenchSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkStateSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupBenchSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupStateSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadBenchSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/ThreadStateSameThreadTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkBenchHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/BenchmarkStateHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupBenchHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/GroupStateHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadBenchHelperTimesTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/times/ThreadStateHelperTimesTest.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkMode.java
- jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkType.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/GenerateMicroBenchmark.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/MicroBenchmark.java
+ jmh-core/src/main/java/org/openjdk/jmh/annotations/Mode.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MethodGroup.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkHandlers.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/options/handlers/BenchmarkTypeOptionHandler.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/parameters/MicroBenchmarkParametersFactory.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_17_SyncIterations.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java

Changeset: 7b2aed5bd1ba
Author:    shade
Date:      2013-06-04 13:46 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/7b2aed5bd1ba

Rename constants in Mode.*

! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/BlackholeBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/DeadCodeBench.java
! jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/NanotimeBench.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/MicroBenchmark.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/Mode.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_07_FixtureLevelInvocation.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_08_DeadCode.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_09_Blackholes.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_10_ConstantFold.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_11_Loops.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_12_Forking.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_13_RunToRun.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_15_Asymmetric.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_16_CompilerControl.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_21_ConsumeCPU.java

Changeset: 9965f7887601
Author:    shade
Date:      2013-06-04 13:49 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/9965f7887601

Fix the failing test.

! jmh-core/src/test/resources/org/openjdk/jmh/runner/MicroBenchmarks

Changeset: be430c14ada0
Author:    shade
Date:      2013-06-04 14:04 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/be430c14ada0

Phase out @Microbenchmark as the supported interface completely.

! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/BaseRunner.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/MicroBenchmarkHandlers.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/parameters/MicroBenchmarkParametersFactory.java
! jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.java

Changeset: 9d9133e41e4c
Author:    shade
Date:      2013-06-04 14:46 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/9d9133e41e4c

Accept multiple -bm options.

! jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java
+ jmh-core/src/main/java/org/openjdk/jmh/runner/options/handlers/BenchmarkModeTypeOptionHandler.java
- jmh-core/src/main/java/org/openjdk/jmh/runner/options/handlers/BenchmarkTypeOptionHandler.java

Changeset: f1383f50315b
Author:    shade
Date:      2013-06-04 15:01 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/f1383f50315b

Accept multiple BenchmarkMode arguments.

! jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkMode.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/MethodGroup.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkRecord.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java
! jmh-samples/src/main/java/org/openjdk/jmh/samples/JMHSample_02_BenchmarkModes.java

Changeset: d0a438249900
Author:    shade
Date:      2013-06-04 15:12 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/d0a438249900

@Generated to include generator name, as per its Javadoc.

! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java

Changeset: e82505a6179a
Author:    shade
Date:      2013-06-05 16:04 +0400
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/e82505a6179a

Re-introduce BenchmarkType for backward compatibility.

+ jmh-core/src/main/java/org/openjdk/jmh/annotations/BenchmarkType.java
! jmh-core/src/main/java/org/openjdk/jmh/annotations/GenerateMicroBenchmark.java
! jmh-core/src/main/java/org/openjdk/jmh/processor/internal/GenerateMicroBenchmarkProcessor.java

More information about the jmh-dev mailing list