changeset 46:3d9284da5b4c

Fix copy-paste error in AtomicX/DecAndGet_GetAndAdd tests.
author shade
date Wed, 21 Aug 2013 22:50:41 +0400
parents 25efba01fecc
children 106941a341ac
files 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/AtomicIntegerPairwiseTests.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/AtomicLongPairwiseTests.java tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-array.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-updater.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-array.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-updater.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml
diffstat 12 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerArrayPairwiseTests.java	Wed Aug 21 22:50:41 2013 +0400
@@ -106,7 +106,7 @@
 
     public static class DecAndGet_GetAndAdd extends AbstractTest {
         @Override public void actor1(State s, IntResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = s.a.decrementAndGet(s.idx); }
+        @Override public void actor2(State s, IntResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
     public static class DecAndGet_GetAndDec extends AbstractTest {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerFieldUpdaterPairwiseTests.java	Wed Aug 21 22:50:41 2013 +0400
@@ -104,7 +104,7 @@
 
     public static class DecAndGet_GetAndAdd extends AbstractTest {
         @Override public void actor1(State s, IntResult2 r) { r.r1 = s.u.decrementAndGet(s); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = s.u.decrementAndGet(s); }
+        @Override public void actor2(State s, IntResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
     public static class DecAndGet_GetAndDec extends AbstractTest {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/integer/AtomicIntegerPairwiseTests.java	Wed Aug 21 22:50:41 2013 +0400
@@ -99,7 +99,7 @@
 
     public static class DecAndGet_GetAndAdd extends AbstractTest {
         @Override public void actor1(AtomicInteger s, IntResult2 r) { r.r1 = s.decrementAndGet(); }
-        @Override public void actor2(AtomicInteger s, IntResult2 r) { r.r2 = s.decrementAndGet(); }
+        @Override public void actor2(AtomicInteger s, IntResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
     public static class DecAndGet_GetAndDec extends AbstractTest {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongArrayPairwiseTests.java	Wed Aug 21 22:50:41 2013 +0400
@@ -106,7 +106,7 @@
 
     public static class DecAndGet_GetAndAdd extends AbstractTest {
         @Override public void actor1(State s, LongResult2 r) { r.r1 = s.a.decrementAndGet(s.idx); }
-        @Override public void actor2(State s, LongResult2 r) { r.r2 = s.a.decrementAndGet(s.idx); }
+        @Override public void actor2(State s, LongResult2 r) { r.r2 = s.a.getAndAdd(s.idx, 5); }
     }
 
     public static class DecAndGet_GetAndDec extends AbstractTest {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongFieldUpdaterPairwiseTests.java	Wed Aug 21 22:50:41 2013 +0400
@@ -104,7 +104,7 @@
 
     public static class DecAndGet_GetAndAdd extends AbstractTest {
         @Override public void actor1(State s, LongResult2 r) { r.r1 = s.u.decrementAndGet(s); }
-        @Override public void actor2(State s, LongResult2 r) { r.r2 = s.u.decrementAndGet(s); }
+        @Override public void actor2(State s, LongResult2 r) { r.r2 = s.u.getAndAdd(s, 5); }
     }
 
     public static class DecAndGet_GetAndDec extends AbstractTest {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/atomics/longs/AtomicLongPairwiseTests.java	Wed Aug 21 22:50:41 2013 +0400
@@ -99,7 +99,7 @@
 
     public static class DecAndGet_GetAndAdd extends AbstractTest {
         @Override public void actor1(AtomicLong s, LongResult2 r) { r.r1 = s.decrementAndGet(); }
-        @Override public void actor2(AtomicLong s, LongResult2 r) { r.r2 = s.decrementAndGet(); }
+        @Override public void actor2(AtomicLong s, LongResult2 r) { r.r2 = s.getAndAdd(5); }
     }
 
     public static class DecAndGet_GetAndDec extends AbstractTest {
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-array.xml	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-array.xml	Wed Aug 21 22:50:41 2013 +0400
@@ -324,12 +324,12 @@
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
-            <match>[-1, -2]</match>
+            <match>[-1, -1]</match>
             <expect>ACCEPTABLE</expect>
             <description>T1 -> T2 execution.</description>
         </case>
         <case>
-            <match>[-2, -1]</match>
+            <match>[4, 0]</match>
             <expect>ACCEPTABLE</expect>
             <description>T2 -> T1 execution.</description>
         </case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-updater.xml	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-updater.xml	Wed Aug 21 22:50:41 2013 +0400
@@ -277,12 +277,12 @@
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
-            <match>[-1, -2]</match>
+            <match>[-1, -1]</match>
             <expect>ACCEPTABLE</expect>
             <description>T1 -> T2 execution.</description>
         </case>
         <case>
-            <match>[-2, -1]</match>
+            <match>[4, 0]</match>
             <expect>ACCEPTABLE</expect>
             <description>T2 -> T1 execution.</description>
         </case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml	Wed Aug 21 22:50:41 2013 +0400
@@ -304,12 +304,12 @@
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
-            <match>[-1, -2]</match>
+            <match>[-1, -1]</match>
             <expect>ACCEPTABLE</expect>
             <description>T1 -> T2 execution.</description>
         </case>
         <case>
-            <match>[-2, -1]</match>
+            <match>[4, 0]</match>
             <expect>ACCEPTABLE</expect>
             <description>T2 -> T1 execution.</description>
         </case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-array.xml	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-array.xml	Wed Aug 21 22:50:41 2013 +0400
@@ -324,12 +324,12 @@
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
-            <match>[-1, -2]</match>
+            <match>[-1, -1]</match>
             <expect>ACCEPTABLE</expect>
             <description>T1 -> T2 execution.</description>
         </case>
         <case>
-            <match>[-2, -1]</match>
+            <match>[4, 0]</match>
             <expect>ACCEPTABLE</expect>
             <description>T2 -> T1 execution.</description>
         </case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-updater.xml	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-updater.xml	Wed Aug 21 22:50:41 2013 +0400
@@ -277,12 +277,12 @@
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
-            <match>[-1, -2]</match>
+            <match>[-1, -1]</match>
             <expect>ACCEPTABLE</expect>
             <description>T1 -> T2 execution.</description>
         </case>
         <case>
-            <match>[-2, -1]</match>
+            <match>[4, 0]</match>
             <expect>ACCEPTABLE</expect>
             <description>T2 -> T1 execution.</description>
         </case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml	Thu Aug 15 10:51:09 2013 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml	Wed Aug 21 22:50:41 2013 +0400
@@ -304,12 +304,12 @@
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
-            <match>[-1, -2]</match>
+            <match>[-1, -1]</match>
             <expect>ACCEPTABLE</expect>
             <description>T1 -> T2 execution.</description>
         </case>
         <case>
-            <match>[-2, -1]</match>
+            <match>[4, 0]</match>
             <expect>ACCEPTABLE</expect>
             <description>T2 -> T1 execution.</description>
         </case>