changeset 140:3d709e4c657a

Rename ConcurrencyStressTest to JCStressTest.
author shade
date Tue, 18 Mar 2014 19:09:52 +0400
parents d2d41e3309f6
children b86a7026d3a0
files jcstress-core/src/main/java/org/openjdk/jcstress/annotations/ConcurrencyStressTest.java jcstress-core/src/main/java/org/openjdk/jcstress/annotations/JCStressTest.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/ConcurrencyStressTestProcessor.java jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/JCStressTestProcessor.java jcstress-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java jcstress-test-gen/src/main/java/org/openjdk/jcstress/tracer/TraceGen.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferViewsAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/CharBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferViewsAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DoubleBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/FloatBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/IntBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ShortBufferAtomicityTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/ByteBufferIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/DirectByteBufferIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/UnsafeIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongInitialValueTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/BooleanLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ByteLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/CharLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/DoubleLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/FloatLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/IntLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/LongLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ObjectLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ShortLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/BooleanLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ByteLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/CharLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/DoubleLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/FloatLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/IntLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/LongLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ObjectLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ShortLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/BooleanLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ByteLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/CharLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/DoubleLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/FloatLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/IntLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/LongLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ObjectLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ShortLazyTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedAcquireReleaseTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedDekkerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedPublicationTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedReadTwiceTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedAcquireReleaseTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedDekkerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedPublicationTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedReadTwiceTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/future/FutureTaskSetTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/BooleanFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ByteFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/CharFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/DoubleFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/FloatFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/IntFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/LongFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ShortFencedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/BooleanFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ByteFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/CharFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/DoubleFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/FloatFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/IntFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/LongFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ShortFinalTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/BooleanInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ByteInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/CharInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/DoubleInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/FloatInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/IntInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/LongInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ShortInstanceInitializerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BooleanPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BytePlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/CharPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/DoublePlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/FloatPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/IntPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/LongPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/ShortPlainTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/BooleanVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ByteVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/CharVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/DoubleVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/FloatVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/IntVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/LongVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ShortVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier0Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier1Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier2Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier3Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantLockMutexTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantRWLockMutexTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/SynchronizedMutexTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockTransitionTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/AQSTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/BitSetTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/FailingCASTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/Unsafe_GetDoubleVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_1_Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/VW_Sync_2_Test.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/SynchronizedTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadJoinTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/ThreadStartTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/scratch/basic/VolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/FinalWrapperSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/HolderSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeDCLSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeDCLSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeLocalDCLSingletonTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/ArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeArrayInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/UnsafeIntTearingTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ByteBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/CharBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DirectByteBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/DoubleBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/FloatBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/IntBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/LongBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/tearing/buffers/ShortBufferInterleaveTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong1.java tests-custom/src/main/java/org/openjdk/jcstress/tests/unsafe/UnsafeAddLong42.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DekkerTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DoubleVolatileTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/IRIWTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/LazySetTransitivityTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadAfterVolatileReadTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/ReadTwiceOverVolatileReadTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileAcquireReleaseTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIRIWTest.java tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/VolatileIncrementAtomicityTest.java
diffstat 233 files changed, 1611 insertions(+), 1611 deletions(-) [+]
line wrap: on
line diff
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/ConcurrencyStressTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jcstress.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks the class that should be treated as the concurrency stress test.
- * <p/>
- * {@link Actor} and {@link Arbiter} annotations are used to describe test
- * behavior. {@link State} and {@link Result} annotations are used to
- * describe the test state.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ConcurrencyStressTest {
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/annotations/JCStressTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks the class that should be treated as the concurrency stress test.
+ * <p/>
+ * {@link Actor} and {@link Arbiter} annotations are used to describe test
+ * behavior. {@link State} and {@link Result} annotations are used to
+ * describe the test state.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JCStressTest {
+}
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/ConcurrencyStressTestProcessor.java	Tue Mar 18 18:20:36 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,461 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openjdk.jcstress.infra.processors;
-
-import org.openjdk.jcstress.Options;
-import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
-import org.openjdk.jcstress.annotations.Result;
-import org.openjdk.jcstress.annotations.State;
-import org.openjdk.jcstress.infra.collectors.TestResultCollector;
-import org.openjdk.jcstress.infra.runners.Control;
-import org.openjdk.jcstress.infra.runners.Runner;
-import org.openjdk.jcstress.infra.runners.StateHolder;
-import org.openjdk.jcstress.infra.runners.TestList;
-import org.openjdk.jcstress.util.ArrayUtils;
-import org.openjdk.jcstress.util.Counter;
-import org.openjdk.jcstress.util.Counters;
-
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.util.ElementFilter;
-import javax.tools.Diagnostic;
-import javax.tools.FileObject;
-import javax.tools.StandardLocation;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
-public class ConcurrencyStressTestProcessor extends AbstractProcessor {
-
-    private final List<TestInfo> tests = new ArrayList<TestInfo>();
-
-    @Override
-    public Set<String> getSupportedAnnotationTypes() {
-        return Collections.singleton(ConcurrencyStressTest.class.getName());
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        if (!roundEnv.processingOver()) {
-            Set<? extends Element> set = roundEnv.getElementsAnnotatedWith(ConcurrencyStressTest.class);
-            for (Element el : set) {
-                TypeElement e = (TypeElement) el;
-                try {
-                    TestInfo info = parseAndValidate(e);
-                    generate(info);
-                    tests.add(info);
-                } catch (GenerationException ex) {
-                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, ex.getMessage(), ex.getElement());
-                }
-            }
-        } else {
-            try {
-                FileObject file = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", TestList.LIST.substring(1));
-                PrintWriter writer = new PrintWriter(file.openWriter());
-                for (TestInfo test : tests) {
-                    writer.println(test.getTest().getQualifiedName() + "," + test.getGeneratedName() + "," + test.getActors().size());
-                }
-                writer.close();
-            } catch (IOException ex) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Error writing MicroBenchmark list " + ex);
-            }
-        }
-        return true;
-    }
-
-    private TestInfo parseAndValidate(TypeElement e) {
-        TestInfo info = new TestInfo();
-
-        info.setTest(e);
-
-        for (ExecutableElement method : ElementFilter.methodsIn(e.getEnclosedElements())) {
-            if (method.getAnnotation(Actor.class) != null) {
-                info.addActor(method);
-            }
-
-            if (method.getAnnotation(Arbiter.class) != null) {
-                info.setArbiter(method);
-            }
-
-            for (VariableElement var : method.getParameters()) {
-                TypeElement paramClass = (TypeElement) processingEnv.getTypeUtils().asElement(var.asType());
-                if (paramClass.getAnnotation(State.class) != null) {
-                    info.setState(paramClass);
-                } else if (paramClass.getAnnotation(Result.class) != null) {
-                    info.setResult(paramClass);
-                } else {
-                    throw new GenerationException("The parameter for @" + Actor.class.getSimpleName() +
-                            " methods requires either @" + State.class.getSimpleName() + " or @" + Result.class.getSimpleName() +
-                            " annotated class", var);
-                }
-            }
-        }
-
-        if (e.getAnnotation(State.class) != null) {
-            info.setState(e);
-        } else if (e.getAnnotation(Result.class) != null) {
-            info.setResult(e);
-        }
-
-        if (info.getState() == null) {
-            throw new GenerationException("@" + ConcurrencyStressTest.class.getSimpleName() + " defines no @" +
-                    State.class.getSimpleName() + " to work with", e);
-        }
-
-        if (info.getResult() == null) {
-            throw new GenerationException("@" + ConcurrencyStressTest.class.getSimpleName() + " defines no @" +
-                    Result.class.getSimpleName() + " to work with", e);
-        }
-
-        String packageName = getPackageName(info.getTest()) + ".generated";
-        String testName = getGeneratedName(info.getTest());
-
-        info.setGeneratedName(packageName + "." + testName);
-
-        return info;
-    }
-
-    public static String getGeneratedName(Element ci) {
-        String name = "";
-        do {
-            name = ci.getSimpleName() + (name.isEmpty() ? "" : "_" + name);
-            ci = ci.getEnclosingElement();
-        } while (ci != null && ci.getKind() != ElementKind.PACKAGE);
-        return name + "_jcstress";
-    }
-
-    public static String getQualifiedName(Element ci) {
-        String name = "";
-        while (true) {
-            Element parent = ci.getEnclosingElement();
-            if (parent == null || parent.getKind() == ElementKind.PACKAGE) {
-                name = ((TypeElement)ci).getQualifiedName() + (name.isEmpty() ? "" : "$" + name);
-                break;
-            } else {
-                name = ci.getSimpleName() + (name.isEmpty() ? "" : "$" + name);
-            }
-            ci = parent;
-        }
-        return name;
-    }
-
-    private void generate(TestInfo info) {
-        PrintWriter pw;
-        Writer writer;
-        try {
-            writer = processingEnv.getFiler().createSourceFile(getPackageName(info.getTest()) + ".generated." + getGeneratedName(info.getTest())).openWriter();
-            pw = new PrintWriter(writer);
-        } catch (IOException e) {
-            throw new GenerationException("IOException: " + e.getMessage(), info.getTest());
-        }
-
-        String t = info.getTest().getSimpleName().toString();
-        String s = info.getState().getSimpleName().toString();
-        String r = info.getResult().getSimpleName().toString();
-
-        int actorsCount = info.getActors().size();
-
-        pw.println("package " + getPackageName(info.getTest()) + ".generated;");
-
-        printImports(pw, info);
-
-        pw.println("public class " + getGeneratedName(info.getTest()) + " extends Runner<" + r + "> {");
-        pw.println();
-
-        pw.println("    public " + getGeneratedName(info.getTest()) + "(Options opts, TestResultCollector collector, ExecutorService pool) {");
-        pw.println("        super(opts, collector, pool, \"" + getQualifiedName(info.getTest()) + "\");");
-        pw.println("    }");
-        pw.println();
-
-        pw.println("    @Override");
-        pw.println("    public void sanityCheck() throws Throwable {");
-        pw.println("        " + t + " t = new " + t + "();");
-        pw.println("        " + s + " s = new " + s + "();");
-        pw.println("        " + r + " r = new " + r + "();");
-
-        for (ExecutableElement el : info.getActors()) {
-            emitMethod(pw, el, "        t." + el.getSimpleName(), "s", "r");
-        }
-        if (info.getArbiter() != null) {
-            emitMethod(pw, info.getArbiter(), "        t." + info.getArbiter().getSimpleName(), "s", "r");
-        }
-
-        pw.println("    }");
-        pw.println();
-
-        pw.println("    @Override");
-        pw.println("    public Counter<" + r + "> internalRun() {");
-        pw.println("        " + t + " test = new " + t + "();");
-        pw.println("        " + s + "[] poison = new " + s + "[0];");
-        pw.println("        control.isStopped = false;");
-        pw.println();
-        pw.println("        Counter<" + r + "> counter = Counters.newCounter(" + r + ".class);");
-        pw.println();
-        pw.println("        final AtomicReference<StateHolder<" + s + "," + r + ">> version = new AtomicReference<StateHolder<" + s + ", " + r + ">>();");
-        pw.println("        version.set(new StateHolder<" + s + ", " + r + ">(new " + s + "[0], new " + r + "[0], new int[0], " + actorsCount + "));");
-        pw.println();
-        pw.println("        final AtomicInteger epoch = new AtomicInteger();");
-        pw.println();
-        pw.println("        control.isStopped = false;");
-        pw.println("        Collection<Future<?>> tasks = new ArrayList<Future<?>>();");
-
-        for (ExecutableElement a : info.getActors()) {
-            pw.println("        tasks.add(pool.submit(new Runner_" + a.getSimpleName() + "(control, counter, test, poison, version, epoch)));");
-        }
-
-        pw.println();
-        pw.println("        try {");
-        pw.println("            TimeUnit.MILLISECONDS.sleep(control.time);");
-        pw.println("        } catch (InterruptedException e) {");
-        pw.println("        }");
-        pw.println();
-        pw.println("        control.isStopped = true;");
-        pw.println();
-        pw.println("        waitFor(tasks);");
-        pw.println();
-        pw.println("        return counter;");
-        pw.println("    }");
-        pw.println();
-
-        pw.println("    public abstract static class RunnerBase {");
-        pw.println("        final Control control;");
-        pw.println("        final Counter<" + r + "> counter;");
-        pw.println("        final " + t + " test;");
-        pw.println("        final " + s + "[] poison;");
-        pw.println("        final AtomicReference<StateHolder<" + s + "," + r + ">> version;");
-        pw.println("        final AtomicInteger epoch;");
-        pw.println();
-        pw.println("        public RunnerBase(Control control, Counter<" + r + "> counter, " + t + " test, " + s + "[] poison, AtomicReference<StateHolder<" + s + "," + r + ">> version, AtomicInteger epoch) {");
-        pw.println("            this.control = control;");
-        pw.println("            this.counter = counter;");
-        pw.println("            this.test = test;");
-        pw.println("            this.poison = poison;");
-        pw.println("            this.version = version;");
-        pw.println("            this.epoch = epoch;");
-        pw.println("        }");
-        pw.println();
-        pw.println("        public void newEpoch(StateHolder<" + s + "," + r + "> holder) {");
-
-        pw.println("            int loops = holder.loops;");
-        pw.println("            " + s + "[] cur = holder.s;");
-        pw.println("            " + r + "[] res = holder.r;");
-
-        if (info.getArbiter() != null) {
-            pw.println();
-            pw.println("             for (int l = 0; l < loops; l++) {");
-            if (info.getState().equals(info.getTest())) {
-                emitMethod(pw, info.getArbiter(), "                cur[l]." + info.getArbiter().getSimpleName(), "cur[l]", "res[l]");
-            } else {
-                emitMethod(pw, info.getArbiter(), "                test." + info.getArbiter().getSimpleName(), "cur[l]", "res[l]");
-            }
-            pw.println("            }");
-        }
-        pw.println();
-        pw.println("            for (int c = 0; c < loops; c++) {");
-        pw.println("                counter.record(res[c]);");
-        pw.println("            }");
-        pw.println();
-        pw.println("            StateHolder<" + s + ", " + r + "> newHolder;");
-        pw.println("            if (control.isStopped) {");
-        pw.println("                newHolder = new StateHolder<" + s + ", " + r + ">(poison, null, null, " + actorsCount + ");");
-        pw.println("            } else {");
-        pw.println("                int newLoops = holder.hasLaggedWorkers ? Math.max(control.minStride, Math.min(loops * 2, control.maxStride)) : loops;");
-        pw.println();
-        pw.println("                for (int c = 0; c < loops; c++) {");
-
-        for (VariableElement var : ElementFilter.fieldsIn(info.getResult().getEnclosedElements())) {
-            pw.print("                    res[c]." + var.getSimpleName().toString() + " = ");
-            String type = var.asType().toString();
-            if (type.equals("int") || type.equals("long") || type.equals("short") || type.equals("byte") || type.equals("char")) {
-                pw.print("0");
-            } else if (type.equals("double")) {
-                pw.print("0D");
-            } else if (type.equals("float")) {
-                pw.print("0F");
-            } else if (type.equals("boolean")) {
-                pw.print("false");
-            } else {
-                throw new GenerationException("Unable to handle @" + Result.class.getSimpleName() + " field of type " + type, var);
-            }
-            pw.println(";");
-        }
-
-        pw.println("                }");
-        pw.println();
-        pw.println("                " + s + "[] newStride = cur;");
-        pw.println("                " + r + "[] newRes = res;");
-        pw.println("                int[] indices = holder.indices;");
-        pw.println("                if (newLoops > loops) {");
-        pw.println("                    newStride = Arrays.copyOf(cur, newLoops);");
-        pw.println("                    newRes = Arrays.copyOf(res, newLoops);");
-        pw.println("                    for (int c = loops; c < newLoops; c++) {");
-        pw.println("                        newRes[c] = new " + r + "();");
-        pw.println("                    }");
-        pw.println("                    indices = ArrayUtils.generatePermutation(newLoops);");
-        pw.println("                }");
-        pw.println();
-        pw.println("                for (int c = 0; c < newLoops; c++) {");
-        pw.println("                    newStride[c] = new " + s + "();");
-        pw.println("                }");
-        pw.println();
-        pw.println("                newHolder = new StateHolder<" + s + ", " + r + ">(newStride, newRes, indices, " + actorsCount + ");");
-        pw.println("            }");
-        pw.println();
-        pw.println("            version.set(newHolder);");
-        pw.println("        }");
-        pw.println("    }");
-
-        for (ExecutableElement a : info.getActors()) {
-            pw.println();
-            pw.println("    public static class Runner_" + a.getSimpleName() + " extends RunnerBase implements Callable {");
-            pw.println("        public Runner_" + a.getSimpleName() + "(Control control, Counter<" + r + "> counter, " + t + " test, " + s + "[] poison, AtomicReference<StateHolder<" + s + "," + r + ">> version, AtomicInteger epoch) {");
-            pw.println("            super(control, counter, test, poison, version, epoch);");
-            pw.println("        }");
-            pw.println();
-            pw.println("        public Void call() {");
-            pw.println("            int curEpoch = 0;");
-            pw.println();
-            pw.println("            " + t + " lt = test;");
-            pw.println();
-            pw.println("            while (true) {");
-            pw.println("                StateHolder<" + s + ", " + r + "> holder = version.get();");
-            pw.println("                int loops = holder.loops;");
-            pw.println("                int[] indices = holder.indices;");
-            pw.println("                " + s + "[] cur = holder.s;");
-            pw.println("                " + r + "[] res = holder.r;");
-            pw.println();
-            pw.println("                if (cur == poison) {");
-            pw.println("                    return null;");
-            pw.println("                }");
-            pw.println();
-            pw.println("                holder.preRun(control.shouldYield);");
-            pw.println();
-            pw.println("                for (int l = 0; l < loops; l++) {");
-            pw.println("                    int index = indices[l];");
-
-            if (info.getState().equals(info.getTest())) {
-                emitMethod(pw, a, "                    cur[index]." + a.getSimpleName(), "cur[index]", "res[index]");
-            } else {
-                emitMethod(pw, a, "                    lt." + a.getSimpleName(), "cur[index]", "res[index]");
-            }
-
-            pw.println("                }");
-            pw.println();
-            pw.println("                holder.postRun(control.shouldYield);");
-            pw.println();
-            pw.println("                if (epoch.compareAndSet(curEpoch, curEpoch + 1)) {");
-            pw.println("                    newEpoch(holder);");
-            pw.println("                }");
-            pw.println();
-            pw.println("                curEpoch++;");
-            pw.println("                while (curEpoch != epoch.get()) {");
-            pw.println("                    if (control.shouldYield) Thread.yield();");
-            pw.println("                }");
-            pw.println();
-            pw.println("                holder.postConsume(control.shouldYield);");
-            pw.println("            }");
-            pw.println("        }");
-            pw.println("    }");
-        }
-        pw.println("}");
-
-        pw.close();
-    }
-
-    private void emitMethod(PrintWriter pw, ExecutableElement el, String lvalue, String stateAccessor, String resultAccessor) {
-        pw.print(lvalue + "(");
-
-        boolean isFirst = true;
-        for (VariableElement var : el.getParameters()) {
-            if (isFirst) {
-                isFirst = false;
-            } else {
-                pw.print(", ");
-            }
-            TypeElement paramClass = (TypeElement) processingEnv.getTypeUtils().asElement(var.asType());
-            if (paramClass.getAnnotation(State.class) != null) {
-                pw.print(stateAccessor);
-            } else if (paramClass.getAnnotation(Result.class) != null) {
-                pw.print(resultAccessor);
-            }
-        }
-        pw.println(");");
-    }
-
-    private void printImports(PrintWriter pw, TestInfo info) {
-        Class<?>[] imports = new Class<?>[] {
-                ArrayList.class, Arrays.class, Collection.class,
-                Callable.class, ExecutorService.class, Future.class, TimeUnit.class,
-                AtomicInteger.class, AtomicReference.class,
-                Options.class, TestResultCollector.class,
-                Control.class, Runner.class, StateHolder.class,
-                ArrayUtils.class, Counter.class, Counters.class
-        };
-
-        for (Class<?> c : imports) {
-            pw.println("import " + c.getName() + ';');
-        }
-        pw.println("import " + info.getTest().getQualifiedName() + ";");
-        pw.println("import " + info.getResult().getQualifiedName() + ";");
-        if (!info.getState().equals(info.getTest())) {
-            pw.println("import " + info.getState().getQualifiedName() + ";");
-        }
-
-        pw.println();
-    }
-
-    public String getPackageName(Element el) {
-        Element walk = el;
-        while (walk.getKind() != ElementKind.PACKAGE) {
-            walk = walk.getEnclosingElement();
-        }
-        return ((PackageElement)walk).getQualifiedName().toString();
-    }
-
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/processors/JCStressTestProcessor.java	Tue Mar 18 19:09:52 2014 +0400
@@ -0,0 +1,461 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.infra.processors;
+
+import org.openjdk.jcstress.Options;
+import org.openjdk.jcstress.annotations.Actor;
+import org.openjdk.jcstress.annotations.Arbiter;
+import org.openjdk.jcstress.annotations.JCStressTest;
+import org.openjdk.jcstress.annotations.Result;
+import org.openjdk.jcstress.annotations.State;
+import org.openjdk.jcstress.infra.collectors.TestResultCollector;
+import org.openjdk.jcstress.infra.runners.Control;
+import org.openjdk.jcstress.infra.runners.Runner;
+import org.openjdk.jcstress.infra.runners.StateHolder;
+import org.openjdk.jcstress.infra.runners.TestList;
+import org.openjdk.jcstress.util.ArrayUtils;
+import org.openjdk.jcstress.util.Counter;
+import org.openjdk.jcstress.util.Counters;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.util.ElementFilter;
+import javax.tools.Diagnostic;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+public class JCStressTestProcessor extends AbstractProcessor {
+
+    private final List<TestInfo> tests = new ArrayList<TestInfo>();
+
+    @Override
+    public Set<String> getSupportedAnnotationTypes() {
+        return Collections.singleton(JCStressTest.class.getName());
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            Set<? extends Element> set = roundEnv.getElementsAnnotatedWith(JCStressTest.class);
+            for (Element el : set) {
+                TypeElement e = (TypeElement) el;
+                try {
+                    TestInfo info = parseAndValidate(e);
+                    generate(info);
+                    tests.add(info);
+                } catch (GenerationException ex) {
+                    processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, ex.getMessage(), ex.getElement());
+                }
+            }
+        } else {
+            try {
+                FileObject file = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", TestList.LIST.substring(1));
+                PrintWriter writer = new PrintWriter(file.openWriter());
+                for (TestInfo test : tests) {
+                    writer.println(test.getTest().getQualifiedName() + "," + test.getGeneratedName() + "," + test.getActors().size());
+                }
+                writer.close();
+            } catch (IOException ex) {
+                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Error writing MicroBenchmark list " + ex);
+            }
+        }
+        return true;
+    }
+
+    private TestInfo parseAndValidate(TypeElement e) {
+        TestInfo info = new TestInfo();
+
+        info.setTest(e);
+
+        for (ExecutableElement method : ElementFilter.methodsIn(e.getEnclosedElements())) {
+            if (method.getAnnotation(Actor.class) != null) {
+                info.addActor(method);
+            }
+
+            if (method.getAnnotation(Arbiter.class) != null) {
+                info.setArbiter(method);
+            }
+
+            for (VariableElement var : method.getParameters()) {
+                TypeElement paramClass = (TypeElement) processingEnv.getTypeUtils().asElement(var.asType());
+                if (paramClass.getAnnotation(State.class) != null) {
+                    info.setState(paramClass);
+                } else if (paramClass.getAnnotation(Result.class) != null) {
+                    info.setResult(paramClass);
+                } else {
+                    throw new GenerationException("The parameter for @" + Actor.class.getSimpleName() +
+                            " methods requires either @" + State.class.getSimpleName() + " or @" + Result.class.getSimpleName() +
+                            " annotated class", var);
+                }
+            }
+        }
+
+        if (e.getAnnotation(State.class) != null) {
+            info.setState(e);
+        } else if (e.getAnnotation(Result.class) != null) {
+            info.setResult(e);
+        }
+
+        if (info.getState() == null) {
+            throw new GenerationException("@" + JCStressTest.class.getSimpleName() + " defines no @" +
+                    State.class.getSimpleName() + " to work with", e);
+        }
+
+        if (info.getResult() == null) {
+            throw new GenerationException("@" + JCStressTest.class.getSimpleName() + " defines no @" +
+                    Result.class.getSimpleName() + " to work with", e);
+        }
+
+        String packageName = getPackageName(info.getTest()) + ".generated";
+        String testName = getGeneratedName(info.getTest());
+
+        info.setGeneratedName(packageName + "." + testName);
+
+        return info;
+    }
+
+    public static String getGeneratedName(Element ci) {
+        String name = "";
+        do {
+            name = ci.getSimpleName() + (name.isEmpty() ? "" : "_" + name);
+            ci = ci.getEnclosingElement();
+        } while (ci != null && ci.getKind() != ElementKind.PACKAGE);
+        return name + "_jcstress";
+    }
+
+    public static String getQualifiedName(Element ci) {
+        String name = "";
+        while (true) {
+            Element parent = ci.getEnclosingElement();
+            if (parent == null || parent.getKind() == ElementKind.PACKAGE) {
+                name = ((TypeElement)ci).getQualifiedName() + (name.isEmpty() ? "" : "$" + name);
+                break;
+            } else {
+                name = ci.getSimpleName() + (name.isEmpty() ? "" : "$" + name);
+            }
+            ci = parent;
+        }
+        return name;
+    }
+
+    private void generate(TestInfo info) {
+        PrintWriter pw;
+        Writer writer;
+        try {
+            writer = processingEnv.getFiler().createSourceFile(getPackageName(info.getTest()) + ".generated." + getGeneratedName(info.getTest())).openWriter();
+            pw = new PrintWriter(writer);
+        } catch (IOException e) {
+            throw new GenerationException("IOException: " + e.getMessage(), info.getTest());
+        }
+
+        String t = info.getTest().getSimpleName().toString();
+        String s = info.getState().getSimpleName().toString();
+        String r = info.getResult().getSimpleName().toString();
+
+        int actorsCount = info.getActors().size();
+
+        pw.println("package " + getPackageName(info.getTest()) + ".generated;");
+
+        printImports(pw, info);
+
+        pw.println("public class " + getGeneratedName(info.getTest()) + " extends Runner<" + r + "> {");
+        pw.println();
+
+        pw.println("    public " + getGeneratedName(info.getTest()) + "(Options opts, TestResultCollector collector, ExecutorService pool) {");
+        pw.println("        super(opts, collector, pool, \"" + getQualifiedName(info.getTest()) + "\");");
+        pw.println("    }");
+        pw.println();
+
+        pw.println("    @Override");
+        pw.println("    public void sanityCheck() throws Throwable {");
+        pw.println("        " + t + " t = new " + t + "();");
+        pw.println("        " + s + " s = new " + s + "();");
+        pw.println("        " + r + " r = new " + r + "();");
+
+        for (ExecutableElement el : info.getActors()) {
+            emitMethod(pw, el, "        t." + el.getSimpleName(), "s", "r");
+        }
+        if (info.getArbiter() != null) {
+            emitMethod(pw, info.getArbiter(), "        t." + info.getArbiter().getSimpleName(), "s", "r");
+        }
+
+        pw.println("    }");
+        pw.println();
+
+        pw.println("    @Override");
+        pw.println("    public Counter<" + r + "> internalRun() {");
+        pw.println("        " + t + " test = new " + t + "();");
+        pw.println("        " + s + "[] poison = new " + s + "[0];");
+        pw.println("        control.isStopped = false;");
+        pw.println();
+        pw.println("        Counter<" + r + "> counter = Counters.newCounter(" + r + ".class);");
+        pw.println();
+        pw.println("        final AtomicReference<StateHolder<" + s + "," + r + ">> version = new AtomicReference<StateHolder<" + s + ", " + r + ">>();");
+        pw.println("        version.set(new StateHolder<" + s + ", " + r + ">(new " + s + "[0], new " + r + "[0], new int[0], " + actorsCount + "));");
+        pw.println();
+        pw.println("        final AtomicInteger epoch = new AtomicInteger();");
+        pw.println();
+        pw.println("        control.isStopped = false;");
+        pw.println("        Collection<Future<?>> tasks = new ArrayList<Future<?>>();");
+
+        for (ExecutableElement a : info.getActors()) {
+            pw.println("        tasks.add(pool.submit(new Runner_" + a.getSimpleName() + "(control, counter, test, poison, version, epoch)));");
+        }
+
+        pw.println();
+        pw.println("        try {");
+        pw.println("            TimeUnit.MILLISECONDS.sleep(control.time);");
+        pw.println("        } catch (InterruptedException e) {");
+        pw.println("        }");
+        pw.println();
+        pw.println("        control.isStopped = true;");
+        pw.println();
+        pw.println("        waitFor(tasks);");
+        pw.println();
+        pw.println("        return counter;");
+        pw.println("    }");
+        pw.println();
+
+        pw.println("    public abstract static class RunnerBase {");
+        pw.println("        final Control control;");
+        pw.println("        final Counter<" + r + "> counter;");
+        pw.println("        final " + t + " test;");
+        pw.println("        final " + s + "[] poison;");
+        pw.println("        final AtomicReference<StateHolder<" + s + "," + r + ">> version;");
+        pw.println("        final AtomicInteger epoch;");
+        pw.println();
+        pw.println("        public RunnerBase(Control control, Counter<" + r + "> counter, " + t + " test, " + s + "[] poison, AtomicReference<StateHolder<" + s + "," + r + ">> version, AtomicInteger epoch) {");
+        pw.println("            this.control = control;");
+        pw.println("            this.counter = counter;");
+        pw.println("            this.test = test;");
+        pw.println("            this.poison = poison;");
+        pw.println("            this.version = version;");
+        pw.println("            this.epoch = epoch;");
+        pw.println("        }");
+        pw.println();
+        pw.println("        public void newEpoch(StateHolder<" + s + "," + r + "> holder) {");
+
+        pw.println("            int loops = holder.loops;");
+        pw.println("            " + s + "[] cur = holder.s;");
+        pw.println("            " + r + "[] res = holder.r;");
+
+        if (info.getArbiter() != null) {
+            pw.println();
+            pw.println("             for (int l = 0; l < loops; l++) {");
+            if (info.getState().equals(info.getTest())) {
+                emitMethod(pw, info.getArbiter(), "                cur[l]." + info.getArbiter().getSimpleName(), "cur[l]", "res[l]");
+            } else {
+                emitMethod(pw, info.getArbiter(), "                test." + info.getArbiter().getSimpleName(), "cur[l]", "res[l]");
+            }
+            pw.println("            }");
+        }
+        pw.println();
+        pw.println("            for (int c = 0; c < loops; c++) {");
+        pw.println("                counter.record(res[c]);");
+        pw.println("            }");
+        pw.println();
+        pw.println("            StateHolder<" + s + ", " + r + "> newHolder;");
+        pw.println("            if (control.isStopped) {");
+        pw.println("                newHolder = new StateHolder<" + s + ", " + r + ">(poison, null, null, " + actorsCount + ");");
+        pw.println("            } else {");
+        pw.println("                int newLoops = holder.hasLaggedWorkers ? Math.max(control.minStride, Math.min(loops * 2, control.maxStride)) : loops;");
+        pw.println();
+        pw.println("                for (int c = 0; c < loops; c++) {");
+
+        for (VariableElement var : ElementFilter.fieldsIn(info.getResult().getEnclosedElements())) {
+            pw.print("                    res[c]." + var.getSimpleName().toString() + " = ");
+            String type = var.asType().toString();
+            if (type.equals("int") || type.equals("long") || type.equals("short") || type.equals("byte") || type.equals("char")) {
+                pw.print("0");
+            } else if (type.equals("double")) {
+                pw.print("0D");
+            } else if (type.equals("float")) {
+                pw.print("0F");
+            } else if (type.equals("boolean")) {
+                pw.print("false");
+            } else {
+                throw new GenerationException("Unable to handle @" + Result.class.getSimpleName() + " field of type " + type, var);
+            }
+            pw.println(";");
+        }
+
+        pw.println("                }");
+        pw.println();
+        pw.println("                " + s + "[] newStride = cur;");
+        pw.println("                " + r + "[] newRes = res;");
+        pw.println("                int[] indices = holder.indices;");
+        pw.println("                if (newLoops > loops) {");
+        pw.println("                    newStride = Arrays.copyOf(cur, newLoops);");
+        pw.println("                    newRes = Arrays.copyOf(res, newLoops);");
+        pw.println("                    for (int c = loops; c < newLoops; c++) {");
+        pw.println("                        newRes[c] = new " + r + "();");
+        pw.println("                    }");
+        pw.println("                    indices = ArrayUtils.generatePermutation(newLoops);");
+        pw.println("                }");
+        pw.println();
+        pw.println("                for (int c = 0; c < newLoops; c++) {");
+        pw.println("                    newStride[c] = new " + s + "();");
+        pw.println("                }");
+        pw.println();
+        pw.println("                newHolder = new StateHolder<" + s + ", " + r + ">(newStride, newRes, indices, " + actorsCount + ");");
+        pw.println("            }");
+        pw.println();
+        pw.println("            version.set(newHolder);");
+        pw.println("        }");
+        pw.println("    }");
+
+        for (ExecutableElement a : info.getActors()) {
+            pw.println();
+            pw.println("    public static class Runner_" + a.getSimpleName() + " extends RunnerBase implements Callable {");
+            pw.println("        public Runner_" + a.getSimpleName() + "(Control control, Counter<" + r + "> counter, " + t + " test, " + s + "[] poison, AtomicReference<StateHolder<" + s + "," + r + ">> version, AtomicInteger epoch) {");
+            pw.println("            super(control, counter, test, poison, version, epoch);");
+            pw.println("        }");
+            pw.println();
+            pw.println("        public Void call() {");
+            pw.println("            int curEpoch = 0;");
+            pw.println();
+            pw.println("            " + t + " lt = test;");
+            pw.println();
+            pw.println("            while (true) {");
+            pw.println("                StateHolder<" + s + ", " + r + "> holder = version.get();");
+            pw.println("                int loops = holder.loops;");
+            pw.println("                int[] indices = holder.indices;");
+            pw.println("                " + s + "[] cur = holder.s;");
+            pw.println("                " + r + "[] res = holder.r;");
+            pw.println();
+            pw.println("                if (cur == poison) {");
+            pw.println("                    return null;");
+            pw.println("                }");
+            pw.println();
+            pw.println("                holder.preRun(control.shouldYield);");
+            pw.println();
+            pw.println("                for (int l = 0; l < loops; l++) {");
+            pw.println("                    int index = indices[l];");
+
+            if (info.getState().equals(info.getTest())) {
+                emitMethod(pw, a, "                    cur[index]." + a.getSimpleName(), "cur[index]", "res[index]");
+            } else {
+                emitMethod(pw, a, "                    lt." + a.getSimpleName(), "cur[index]", "res[index]");
+            }
+
+            pw.println("                }");
+            pw.println();
+            pw.println("                holder.postRun(control.shouldYield);");
+            pw.println();
+            pw.println("                if (epoch.compareAndSet(curEpoch, curEpoch + 1)) {");
+            pw.println("                    newEpoch(holder);");
+            pw.println("                }");
+            pw.println();
+            pw.println("                curEpoch++;");
+            pw.println("                while (curEpoch != epoch.get()) {");
+            pw.println("                    if (control.shouldYield) Thread.yield();");
+            pw.println("                }");
+            pw.println();
+            pw.println("                holder.postConsume(control.shouldYield);");
+            pw.println("            }");
+            pw.println("        }");
+            pw.println("    }");
+        }
+        pw.println("}");
+
+        pw.close();
+    }
+
+    private void emitMethod(PrintWriter pw, ExecutableElement el, String lvalue, String stateAccessor, String resultAccessor) {
+        pw.print(lvalue + "(");
+
+        boolean isFirst = true;
+        for (VariableElement var : el.getParameters()) {
+            if (isFirst) {
+                isFirst = false;
+            } else {
+                pw.print(", ");
+            }
+            TypeElement paramClass = (TypeElement) processingEnv.getTypeUtils().asElement(var.asType());
+            if (paramClass.getAnnotation(State.class) != null) {
+                pw.print(stateAccessor);
+            } else if (paramClass.getAnnotation(Result.class) != null) {
+                pw.print(resultAccessor);
+            }
+        }
+        pw.println(");");
+    }
+
+    private void printImports(PrintWriter pw, TestInfo info) {
+        Class<?>[] imports = new Class<?>[] {
+                ArrayList.class, Arrays.class, Collection.class,
+                Callable.class, ExecutorService.class, Future.class, TimeUnit.class,
+                AtomicInteger.class, AtomicReference.class,
+                Options.class, TestResultCollector.class,
+                Control.class, Runner.class, StateHolder.class,
+                ArrayUtils.class, Counter.class, Counters.class
+        };
+
+        for (Class<?> c : imports) {
+            pw.println("import " + c.getName() + ';');
+        }
+        pw.println("import " + info.getTest().getQualifiedName() + ";");
+        pw.println("import " + info.getResult().getQualifiedName() + ";");
+        if (!info.getState().equals(info.getTest())) {
+            pw.println("import " + info.getState().getQualifiedName() + ";");
+        }
+
+        pw.println();
+    }
+
+    public String getPackageName(Element el) {
+        Element walk = el;
+        while (walk.getKind() != ElementKind.PACKAGE) {
+            walk = walk.getEnclosingElement();
+        }
+        return ((PackageElement)walk).getQualifiedName().toString();
+    }
+
+}
--- a/jcstress-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor	Tue Mar 18 18:20:36 2014 +0400
+++ b/jcstress-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor	Tue Mar 18 19:09:52 2014 +0400
@@ -21,4 +21,4 @@
 #    or visit www.oracle.com if you need additional information or have any
 #    questions.
 #
-org.openjdk.jcstress.infra.processors.ConcurrencyStressTestProcessor
+org.openjdk.jcstress.infra.processors.JCStressTestProcessor
--- a/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/jcstress-test-gen/src/main/java/org/openjdk/jcstress/generator/TestGenerator.java	Tue Mar 18 19:09:52 2014 +0400
@@ -143,10 +143,10 @@
         }
         pw.println("import org.openjdk.jcstress.infra.results." + resultName + ";");
         pw.println("import org.openjdk.jcstress.annotations.Actor;");
-        pw.println("import org.openjdk.jcstress.annotations.ConcurrencyStressTest;");
+        pw.println("import org.openjdk.jcstress.annotations.JCStressTest;");
         pw.println("import org.openjdk.jcstress.annotations.State;");
         pw.println();
-        pw.println("@ConcurrencyStressTest");
+        pw.println("@JCStressTest");
         pw.println("@State");
         pw.println("public class " + klass + " {");
         pw.println();
--- a/jcstress-test-gen/src/main/java/org/openjdk/jcstress/tracer/TraceGen.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/jcstress-test-gen/src/main/java/org/openjdk/jcstress/tracer/TraceGen.java	Tue Mar 18 19:09:52 2014 +0400
@@ -206,10 +206,10 @@
         pw.println();
         pw.println("import org.openjdk.jcstress.infra.results." + resultName + ";");
         pw.println("import org.openjdk.jcstress.annotations.Actor;");
-        pw.println("import org.openjdk.jcstress.annotations.ConcurrencyStressTest;");
+        pw.println("import org.openjdk.jcstress.annotations.JCStressTest;");
         pw.println("import org.openjdk.jcstress.annotations.State;");
         pw.println();
-        pw.println("@ConcurrencyStressTest");
+        pw.println("@JCStressTest");
         pw.println("@State");
         pw.println("public class " + klass + " {");
         pw.println();
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -44,7 +44,7 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IntTest {
         @Actor public void actor1(MyState s)                 { s.b.putInt(0, -1);                                    }
         @Actor public void actor2(MyState s, LongResult1 r)  { r.r1 = s.b.getInt(0);                                 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferViewsAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ByteBufferViewsAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -62,37 +62,37 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IntViewTest {
         @Actor public void actor1(MyState s)                { s.ib.put(0, -1);                                  }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.ib.get(0);                               }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CharViewTest {
         @Actor public void actor1(MyState s)                { s.cb.put(0, 'a');                                 }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.cb.get(0);                               }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DoubleViewTest {
         @Actor public void actor1(MyState s)                { s.db.put(0, -1D);                                 }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = Double.doubleToRawLongBits(s.db.get(0));   }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class FloatViewTest {
         @Actor public void actor1(MyState s)                { s.fb.put(0, -1F);                                 }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = Float.floatToRawIntBits(s.fb.get(0));      }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class LongViewTest {
         @Actor public void actor1(MyState s)                { s.lb.put(0, -1);                                  }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.lb.get(0);                               }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class ShortViewTest {
         @Actor public void actor1(MyState s)                { s.sb.put(0, (short) -1);                          }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.sb.get(0);                               }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/CharBufferAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/CharBufferAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -42,7 +42,7 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CharTest {
         @Actor public void actor1(MyState s)                { s.b.put(0, 'a');                                      }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.b.get();                                     }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -44,7 +44,7 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IntTest {
         @Actor public void actor1(MyState s)                 { s.b.putInt(0, -1);                                    }
         @Actor public void actor2(MyState s, LongResult1 r)  { r.r1 = s.b.getInt(0);                                 }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferViewsAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DirectByteBufferViewsAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -62,37 +62,37 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IntViewTest {
         @Actor public void actor1(MyState s)                { s.ib.put(0, -1);                                  }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.ib.get(0);                               }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CharViewTest {
         @Actor public void actor1(MyState s)                { s.cb.put(0, 'a');                                 }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.cb.get(0);                               }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DoubleViewTest {
         @Actor public void actor1(MyState s)                { s.db.put(0, -1D);                                 }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = Double.doubleToRawLongBits(s.db.get(0));   }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class FloatViewTest {
         @Actor public void actor1(MyState s)                { s.fb.put(0, -1F);                                 }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = Float.floatToRawIntBits(s.fb.get(0));      }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class LongViewTest {
         @Actor public void actor1(MyState s)                { s.lb.put(0, -1);                                  }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.lb.get(0);                               }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class ShortViewTest {
         @Actor public void actor1(MyState s)                { s.sb.put(0, (short) -1);                          }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.sb.get(0);                               }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DoubleBufferAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/DoubleBufferAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -42,7 +42,7 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DoubleTest {
         @Actor public void actor1(MyState s)                { s.b.put(0, -1D);                              }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = Double.doubleToRawLongBits(s.b.get()); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/FloatBufferAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/FloatBufferAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -42,7 +42,7 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class FloatTest {
         @Actor public void actor1(MyState s)                { s.b.put(0, -1F);                                    }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = Float.floatToRawIntBits(s.b.get());          }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/IntBufferAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/IntBufferAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -42,7 +42,7 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IntTest {
         @Actor public void actor1(MyState s)                { s.b.put(0, -1);                                       }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.b.get();                                     }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ShortBufferAtomicityTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/buffers/ShortBufferAtomicityTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.buffers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
@@ -42,7 +42,7 @@
         }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class ShortTest {
         @Actor public void actor1(MyState s)                { s.b.put(0, (short)-1);                              }
         @Actor public void actor2(MyState s, LongResult1 r) { r.r1 = s.b.get();                                   }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/ByteBufferIntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/ByteBufferIntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.crosscache;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
@@ -33,7 +33,7 @@
 import java.nio.ByteOrder;
 import java.util.Random;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteBufferIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/DirectByteBufferIntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/DirectByteBufferIntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.crosscache;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
@@ -33,7 +33,7 @@
 import java.nio.ByteOrder;
 import java.util.Random;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DirectByteBufferIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/UnsafeIntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/crosscache/UnsafeIntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,14 +25,14 @@
 package org.openjdk.jcstress.tests.atomicity.crosscache;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
 import java.util.Random;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class UnsafeIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ByteAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ByteAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/CharAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/CharAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharAtomicityTest {
     char x;
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/DoubleAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/DoubleAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/FloatAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/FloatAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/IntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/IntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/LongAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/LongAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ShortAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/ShortAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileByteAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileByteAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileCharAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileCharAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileCharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileDoubleAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileDoubleAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileDoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileFloatAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileFloatAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileFloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileIntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileIntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileLongAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileLongAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult8;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileLongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileShortAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/perbyte/VolatileShortAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.perbyte;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ByteAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/CharAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
@@ -34,7 +34,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/DoubleAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/FloatAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/IntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/LongAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/ShortAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileByteAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileCharAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
@@ -34,7 +34,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileCharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileDoubleAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileDoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileFloatAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileFloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileIntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileLongAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileLongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/plain/VolatileShortAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ByteAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteAtomicityTest  {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/CharAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/DoubleAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/FloatAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
 /**
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/IntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/LongAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/ShortAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileByteAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileByteAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileCharAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileCharAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileDoubleAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileDoubleAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileFloatAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -35,7 +35,7 @@
 /**
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileFloatAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileIntAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileIntAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileLongAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileLongAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomicity/primitives/reflect/VolatileShortAtomicityTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomicity.primitives.reflect;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.tests.atomicity.primitives.Constants;
@@ -37,7 +37,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class VolatileShortAtomicityTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanInitialValueTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanInitialValueTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,13 +25,13 @@
 package org.openjdk.jcstress.tests.atomics.booleans;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class AtomicBooleanInitialValueTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/booleans/AtomicBooleanPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.atomics.booleans;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
@@ -37,37 +37,37 @@
     public static class MyState extends AtomicBoolean {
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_CAS {
         @Actor public void actor1(MyState s, IntResult2 r) { r.r1 = s.compareAndSet(false, true) ? 1 : 0; }
         @Actor public void actor2(MyState s, IntResult2 r) { r.r2 = s.compareAndSet(false, true) ? 1 : 0; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_GetAndSet {
         @Actor public void actor1(MyState s, IntResult2 r) { r.r1 = s.compareAndSet(false, true) ? 1 : 0; }
         @Actor public void actor2(MyState s, IntResult2 r) { r.r2 = s.getAndSet(true) ? 0 : 1; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_WCAS {
         @Actor public void actor1(MyState s, IntResult2 r) { r.r1 = s.compareAndSet(false, true) ? 1 : 0; }
         @Actor public void actor2(MyState s, IntResult2 r) { r.r2 = s.weakCompareAndSet(false, true) ? 1 : 0; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_GetAndSet {
         @Actor public void actor1(MyState s, IntResult2 r) { r.r1 = s.getAndSet(true) ? 0 : 1; }
         @Actor public void actor2(MyState s, IntResult2 r) { r.r2 = s.getAndSet(true) ? 0 : 1; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_WCAS {
         @Actor public void actor1(MyState s, IntResult2 r) { r.r1 = s.getAndSet(true) ? 0 : 1; }
         @Actor public void actor2(MyState s, IntResult2 r) { r.r2 = s.weakCompareAndSet(false, true) ? 1 : 0; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_WCAS {
         @Actor public void actor1(MyState s, IntResult2 r) { r.r1 = s.weakCompareAndSet(false, true) ? 1 : 0; }
         @Actor public void actor2(MyState s, IntResult2 r) { r.r2 = s.weakCompareAndSet(false, true) ? 1 : 0; }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInitialValueTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInitialValueTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,13 +25,13 @@
 package org.openjdk.jcstress.tests.atomics.integer;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
 import java.util.concurrent.atomic.AtomicIntegerArray;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class AtomicIntegerArrayInitialValueTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInterleaveTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayInterleaveTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,13 +26,13 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.util.concurrent.atomic.AtomicIntegerArray;
 
-@ConcurrencyStressTest
+@JCStressTest
 public class AtomicIntegerArrayInterleaveTest {
 
     /** Array size: 256 bytes inevitably crosses the cache line on most implementations */
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,7 +26,7 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.infra.results.IntResult2;
@@ -45,61 +45,61 @@
 
     // ------------------- first is addAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_AddAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.addAndGet(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_DecAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.decrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -107,55 +107,55 @@
 
     // ------------------- first is decAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_DecAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.decrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -163,49 +163,49 @@
 
     // ------------------- first is getAndAdd
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -213,43 +213,43 @@
 
     // ------------------- first is getAndDec
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -257,37 +257,37 @@
 
     // ------------------- first is getAndInc
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -295,31 +295,31 @@
 
     // ------------------- first is getAndSet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -327,25 +327,25 @@
 
     // ------------------- first is incAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -353,19 +353,19 @@
 
     // ------------------- first is CAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.compareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.compareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.compareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -373,13 +373,13 @@
 
     // ------------------- first is WCAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.weakCompareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.a.weakCompareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -387,7 +387,7 @@
 
     // ------------------- first is set
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class Set_Set {
         @Actor public void actor1(S s, IntResult1 r) { s.a.set(s.idx, 5); }
         @Actor public void actor2(S s, IntResult1 r) { s.a.set(s.idx, 10); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,7 +26,7 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.infra.results.IntResult2;
@@ -43,61 +43,61 @@
 
     // ------------------- first is addAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_AddAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.addAndGet(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_DecAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.decrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -105,55 +105,55 @@
 
     // ------------------- first is decAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_DecAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.decrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -161,49 +161,49 @@
 
     // ------------------- first is getAndAdd
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -211,43 +211,43 @@
 
     // ------------------- first is getAndDec
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -255,37 +255,37 @@
 
     // ------------------- first is getAndInc
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -293,31 +293,31 @@
 
     // ------------------- first is getAndSet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -325,25 +325,25 @@
 
     // ------------------- first is incAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -351,19 +351,19 @@
 
     // ------------------- first is CAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.compareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.compareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.compareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -371,13 +371,13 @@
 
     // ------------------- first is WCAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.weakCompareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.u.weakCompareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -385,7 +385,7 @@
 
     // ------------------- first is set
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class Set_Set {
         @Actor   public void actor1(S s, IntResult1 r) { s.u.set(s, 5); }
         @Actor   public void actor2(S s, IntResult1 r) { s.u.set(s, 10); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerInitialValueTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerInitialValueTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,13 +25,13 @@
 package org.openjdk.jcstress.tests.atomics.integer;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class AtomicIntegerInitialValueTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,7 +26,7 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.infra.results.IntResult2;
@@ -41,61 +41,61 @@
 
     // ------------------- first is addAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_AddAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.addAndGet(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_DecAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.decrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -103,55 +103,55 @@
 
     // ------------------- first is decAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_DecAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.decrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -159,49 +159,49 @@
 
     // ------------------- first is getAndAdd
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndAdd {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -209,43 +209,43 @@
 
     // ------------------- first is getAndDec
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndDec {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -253,37 +253,37 @@
 
     // ------------------- first is getAndInc
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndInc {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -291,31 +291,31 @@
 
     // ------------------- first is getAndSet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_GetAndSet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -323,25 +323,25 @@
 
     // ------------------- first is incAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_IncAndGet {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -349,19 +349,19 @@
 
     // ------------------- first is CAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_CAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.compareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.compareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.compareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
@@ -369,13 +369,13 @@
 
     // ------------------- first is WCAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_WCAS {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.weakCompareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_Set {
         @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.weakCompareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, IntResult2 r) { s.set(10); r.r2 = 0; }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInitialValueTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInitialValueTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,13 +25,13 @@
 package org.openjdk.jcstress.tests.atomics.longs;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
 import java.util.concurrent.atomic.AtomicLongArray;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class AtomicLongArrayInitialValueTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInterleaveTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayInterleaveTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,13 +26,13 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
 import java.util.concurrent.atomic.AtomicLongArray;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class AtomicLongArrayInterleaveTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,7 +26,7 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.infra.results.LongResult2;
@@ -45,61 +45,61 @@
 
     // ------------------- first is addAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_AddAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.addAndGet(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_DecAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.decrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.addAndGet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -107,55 +107,55 @@
 
     // ------------------- first is decAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_DecAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.decrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -163,49 +163,49 @@
 
     // ------------------- first is getAndAdd
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndAdd(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -213,43 +213,43 @@
 
     // ------------------- first is getAndDec
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndDecrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndDecrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -257,37 +257,37 @@
 
     // ------------------- first is getAndInc
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndIncrement(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndIncrement(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -295,31 +295,31 @@
 
     // ------------------- first is getAndSet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.getAndSet(s.idx, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.getAndSet(s.idx, 5); }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -327,25 +327,25 @@
 
     // ------------------- first is incAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.incrementAndGet(s.idx); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.incrementAndGet(s.idx); }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -353,19 +353,19 @@
 
     // ------------------- first is CAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.compareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.compareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.compareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.compareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -373,13 +373,13 @@
 
     // ------------------- first is WCAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.weakCompareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.a.weakCompareAndSet(s.idx, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.a.weakCompareAndSet(s.idx, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { s.a.set(s.idx, 10); r.r2 = 0; }
@@ -387,7 +387,7 @@
 
     // ------------------- first is set
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class Set_Set {
         @Actor public void actor1(S s, LongResult1 r) { s.a.set(s.idx, 5); }
         @Actor public void actor2(S s, LongResult1 r) { s.a.set(s.idx, 10); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,7 +26,7 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.infra.results.LongResult2;
@@ -43,61 +43,61 @@
 
     // ------------------- first is addAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_AddAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.addAndGet(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_DecAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.decrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.addAndGet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -105,55 +105,55 @@
 
     // ------------------- first is decAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_DecAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.decrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -161,49 +161,49 @@
 
     // ------------------- first is getAndAdd
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndAdd(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -211,43 +211,43 @@
 
     // ------------------- first is getAndDec
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndDecrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndDecrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -255,37 +255,37 @@
 
     // ------------------- first is getAndInc
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndIncrement(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndIncrement(s); }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -293,31 +293,31 @@
 
     // ------------------- first is getAndSet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.getAndSet(s, 10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.getAndSet(s, 5); }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -325,25 +325,25 @@
 
     // ------------------- first is incAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.incrementAndGet(s); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.incrementAndGet(s); }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -351,19 +351,19 @@
 
     // ------------------- first is CAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.compareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.compareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.compareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.compareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -371,13 +371,13 @@
 
     // ------------------- first is WCAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.weakCompareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.u.weakCompareAndSet(s, 0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.u.weakCompareAndSet(s, 0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { s.u.set(s, 10); r.r2 = 0; }
@@ -385,7 +385,7 @@
 
     // ------------------- first is set
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class Set_Set  {
         @Actor   public void actor1(S s, LongResult1 r) { s.u.set(s, 5); }
         @Actor   public void actor2(S s, LongResult1 r) { s.u.set(s, 10); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongInitialValueTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongInitialValueTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,13 +25,13 @@
 package org.openjdk.jcstress.tests.atomics.longs;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class AtomicLongInitialValueTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,7 +26,7 @@
 
 import org.openjdk.jcstress.annotations.Actor;
 import org.openjdk.jcstress.annotations.Arbiter;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.infra.results.LongResult2;
@@ -42,61 +42,61 @@
 
     // ------------------- first is addAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_AddAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.addAndGet(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_DecAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.decrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class AddAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.addAndGet(5); }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -104,55 +104,55 @@
 
     // ------------------- first is decAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_DecAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.decrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class DecAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -160,49 +160,49 @@
 
     // ------------------- first is getAndAdd
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndAdd {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndAdd_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndAdd(5); }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -210,43 +210,43 @@
 
     // ------------------- first is getAndDec
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndDec {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndDecrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndDec_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndDecrement(); }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -254,37 +254,37 @@
 
     // ------------------- first is getAndInc
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndInc {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndIncrement(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndInc_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndIncrement(); }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -292,31 +292,31 @@
 
     // ------------------- first is getAndSet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_GetAndSet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.getAndSet(10); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class GetAndSet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.getAndSet(5); }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -324,25 +324,25 @@
 
     // ------------------- first is incAndGet
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_IncAndGet {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.incrementAndGet(); }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class IncAndGet_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.incrementAndGet(); }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -350,19 +350,19 @@
 
     // ------------------- first is CAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_CAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.compareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.compareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.compareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class CAS_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.compareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -370,13 +370,13 @@
 
     // ------------------- first is WCAS
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_WCAS {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.weakCompareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { r.r2 = s.weakCompareAndSet(0, 20) ? 20 : 10; }
     }
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class WCAS_Set {
         @Actor public void actor1(S s, LongResult2 r) { r.r1 = s.weakCompareAndSet(0, 5) ? 5 : 1; }
         @Actor public void actor2(S s, LongResult2 r) { s.set(10); r.r2 = 0; }
@@ -384,7 +384,7 @@
 
     // ------------------- first is set
 
-    @ConcurrencyStressTest
+    @JCStressTest
     public static class Set_Set {
         @Actor   public void actor1(S s, LongResult1 r) { s.set(5); }
         @Actor   public void actor2(S s, LongResult1 r) { s.set(10); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/BooleanLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/BooleanLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ByteLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ByteLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/CharLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/CharLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/DoubleLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/DoubleLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/FloatLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/FloatLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/IntLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/IntLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/LongLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/LongLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ObjectLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ObjectLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ObjectLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ShortLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/cached/ShortLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.cached;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/BooleanLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/BooleanLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ByteLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ByteLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/CharLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/CharLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/DoubleLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/DoubleLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/FloatLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/FloatLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/IntLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/IntLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/LongLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/LongLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ObjectLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ObjectLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ObjectLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ShortLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/plain/ShortLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/BooleanLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/BooleanLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ByteLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ByteLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/CharLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/CharLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/DoubleLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/DoubleLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/FloatLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/FloatLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/IntLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/IntLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/LongLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/LongLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ObjectLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ObjectLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ObjectLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ShortLazyTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/causality/lazyinit/volatiles/ShortLazyTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.causality.lazyinit.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortLazyTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedAcquireReleaseTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedAcquireReleaseTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.fences;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
@@ -35,7 +35,7 @@
  *
  *  @author Doug Lea (dl@cs.oswego.edu)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FencedAcquireReleaseTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedDekkerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedDekkerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.fences;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
@@ -35,7 +35,7 @@
  *
  *  @author Doug Lea (dl@cs.oswego.edu)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FencedDekkerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedPublicationTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedPublicationTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.fences;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
@@ -35,7 +35,7 @@
  *
  *  @author Doug Lea (dl@cs.oswego.edu)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FencedPublicationTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedReadTwiceTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/FencedReadTwiceTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.fences;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 import org.openjdk.jcstress.util.UnsafeHolder;
@@ -35,7 +35,7 @@
  *
  * @author Doug Lea (dl@cs.oswego.edu)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FencedReadTwiceTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedAcquireReleaseTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedAcquireReleaseTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.fences;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
@@ -34,7 +34,7 @@
  *
  *  @author Doug Lea (dl@cs.oswego.edu)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class UnfencedAcquireReleaseTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedDekkerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedDekkerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,7 +26,7 @@
 
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.util.UnsafeHolder;
@@ -36,7 +36,7 @@
  *
  *  @author Doug Lea (dl@cs.oswego.edu)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class UnfencedDekkerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedPublicationTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedPublicationTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.fences;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
@@ -34,7 +34,7 @@
  *
  *  @author Doug Lea (dl@cs.oswego.edu)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class UnfencedPublicationTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedReadTwiceTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/fences/UnfencedReadTwiceTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.fences;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult3;
 
@@ -34,7 +34,7 @@
  *
  * @author Aleksey Shipilev (aleksey.shipilev@oracle.com)
  */
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class UnfencedReadTwiceTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/future/FutureTaskSetTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/future/FutureTaskSetTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.future;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
@@ -35,7 +35,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-@ConcurrencyStressTest
+@JCStressTest
 public class FutureTaskSetTest {
 
     @Actor
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/BooleanArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ByteArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/CharArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/DoubleArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/FloatArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/IntArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,11 +26,11 @@
 
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/LongArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ObjectArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ObjectArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/plain/ShortArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/BooleanArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ByteArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/CharArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/DoubleArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/FloatArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/IntArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -26,11 +26,11 @@
 
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/LongArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ObjectArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ObjectArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/arrays/volatiles/ShortArrayInitTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.arrays.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortArrayInitTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/BooleanFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ByteFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/CharFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/DoubleFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/FloatFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/IntFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/LongFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ObjectFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ObjectFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/plain/ShortFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/BooleanFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.BooleanResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ByteFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/CharFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/DoubleFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/FloatFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/IntFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/LongFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ObjectFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ObjectFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/objects/volatiles/ShortFieldsTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.objects.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult4;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortFieldsTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/BooleanFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/BooleanFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ByteFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ByteFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/CharFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/CharFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/DoubleFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/DoubleFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/FloatFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/FloatFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/IntFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/IntFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/LongFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/LongFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ShortFencedTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/fenced/ShortFencedTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,12 +25,12 @@
 package org.openjdk.jcstress.tests.init.primitives.fenced;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 import org.openjdk.jcstress.util.UnsafeHolder;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortFencedTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/BooleanFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/BooleanFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanFinalTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ByteFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ByteFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteFinalTest{
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/CharFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/CharFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharFinalTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/DoubleFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/DoubleFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleFinalTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/FloatFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/FloatFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatFinalTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/IntFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/IntFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntFinalTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/LongFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/LongFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongFinalTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ShortFinalTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/finals/ShortFinalTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.finals;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortFinalTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/BooleanInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/BooleanInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanInstanceInitializerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ByteInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ByteInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteInstanceInitializerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/CharInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/CharInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharInstanceInitializerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/DoubleInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/DoubleInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleInstanceInitializerTest  {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/FloatInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/FloatInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatInstanceInitializerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/IntInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/IntInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntInstanceInitializerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/LongInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/LongInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongInstanceInitializerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ShortInstanceInitializerTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/instance/ShortInstanceInitializerTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.instance;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortInstanceInitializerTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BooleanPlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BooleanPlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanPlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BytePlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/BytePlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BytePlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/CharPlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/CharPlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharPlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/DoublePlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/DoublePlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoublePlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/FloatPlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/FloatPlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatPlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/IntPlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/IntPlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntPlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/LongPlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/LongPlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongPlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/ShortPlainTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/plain/ShortPlainTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.plain;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortPlainTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/BooleanVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/BooleanVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class BooleanVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ByteVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ByteVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ByteResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ByteVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/CharVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/CharVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.CharResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class CharVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/DoubleVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/DoubleVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.DoubleResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class DoubleVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/FloatVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/FloatVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.FloatResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class FloatVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/IntVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/IntVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class IntVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/LongVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/LongVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.LongResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class LongVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ShortVolatileTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/init/primitives/volatiles/ShortVolatileTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.init.primitives.volatiles;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.ShortResult1;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class ShortVolatileTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier0Test.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier0Test.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.locks.barriers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class SyncBarrier0Test {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier1Test.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier1Test.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.locks.barriers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class SyncBarrier1Test {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier2Test.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier2Test.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.locks.barriers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class SyncBarrier2Test {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier3Test.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/barriers/SyncBarrier3Test.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.locks.barriers;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class SyncBarrier3Test {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantLockMutexTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantLockMutexTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.locks.mutex;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
@@ -136,61 +136,61 @@
 
     public static class I_F {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
@@ -199,61 +199,61 @@
 
     public static class I_N {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
@@ -262,61 +262,61 @@
 
     public static class S_N {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
@@ -325,61 +325,61 @@
 
     public static class S_F {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantRWLockMutexTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/ReentrantRWLockMutexTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.locks.mutex;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
@@ -138,61 +138,61 @@
 
     public static class I_F  {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(I_F_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(I_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
@@ -201,61 +201,61 @@
 
     public static class I_N {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(I_N_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(I_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
@@ -264,61 +264,61 @@
 
     public abstract static class S_N {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(S_N_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(S_N_State s, IntResult2 r) { r.r2 = s.TLt(); }
@@ -327,61 +327,61 @@
 
     public abstract static class S_F {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_LI {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_L {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.LI(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TL {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class LI_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.LI(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_L {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.L(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TL {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class L_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.L(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TL {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TL(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TL_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.TL(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class TLt_TLt {
             @Actor public void actor1(S_F_State s, IntResult2 r) { r.r1 = s.TLt(); }
             @Actor public void actor2(S_F_State s, IntResult2 r) { r.r2 = s.TLt(); }
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/SynchronizedMutexTest.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/mutex/SynchronizedMutexTest.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,11 +25,11 @@
 package org.openjdk.jcstress.tests.locks.mutex;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
-@ConcurrencyStressTest
+@JCStressTest
 @State
 public class SynchronizedMutexTest {
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java	Tue Mar 18 18:20:36 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java	Tue Mar 18 19:09:52 2014 +0400
@@ -25,7 +25,7 @@
 package org.openjdk.jcstress.tests.locks.stamped;
 
 import org.openjdk.jcstress.annotations.Actor;
-import org.openjdk.jcstress.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.annotations.JCStressTest;
 import org.openjdk.jcstress.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 
@@ -384,91 +384,91 @@
 
     public abstract static class aRL_U {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -477,91 +477,91 @@
 
     public static class aRWLr_U {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -570,91 +570,91 @@
 
     public static class RL_tUR {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -663,91 +663,91 @@
 
     public static class RL_Us {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -756,91 +756,91 @@
 
     public static class RL_URs {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -849,91 +849,91 @@
 
     public abstract static class RLI_tUR  {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -942,91 +942,91 @@
 
     public static class RLI_Us {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -1035,91 +1035,91 @@
 
     public static class RLI_URs {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -1128,91 +1128,91 @@
 
     public static class tOR_V {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -1221,91 +1221,91 @@
 
     public static class tRL_tUR {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -1314,91 +1314,91 @@
 
     public static class tRL_Us {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -1407,91 +1407,91 @@
 
     public static class tRL_URs {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -1500,91 +1500,91 @@
 
     public abstract static class tRLt_tUR {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class orWL_V {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
@@ -1593,91 +1593,91 @@
 
     public abstract static class tRLt_Us {
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aWL_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class aRWLw_U {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class WLI_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWL_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_tUW {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_Us {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class tWLt_UWs {
             @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
             @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
 
-        @ConcurrencyStressTest
+        @JCStressTest
         public static class