Changeset 517 for Tests

Timestamp:

03/29/12 23:11:33 (10 years ago)

Author:

BegemoT

Message:

 

Location:

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl

Files:

• AbstractSESDSequencer.java (modified) (2 diffs)
• CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java (modified) (3 diffs)
• CABSESDLazySetPaddedUnrolledQueue.java (modified) (2 diffs)
• CABSESDLazySetUnrolledQueue.java (modified) (2 diffs)

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl/AbstractSESDSequencer.java

@@ -58 +58 @@
     }
 
-
-    private final int length;
-    private volatile long headCursor = 0;
-
     /* Elements range: [headCursor, tailCursor)
     *
@@ -74 +70 @@
     * (tailCursor % size ) is the index of _cell_ for _next last item_
     */
+    private final int length;
 
-    private volatile long p11, p12, p13, p14, p15, p16, p17, p18 = 7;
+    private volatile long $pad11, $pad12, $pad13, $pad14, $pad15, $pad16, $pad17, $pad18 = 7;
+    private volatile long headCursor = 0;
+    private volatile long $pad21, $pad22, $pad23, $pad24, $pad25, $pad26, $pad27, $pad28 = 8;
     private volatile long tailCursor = 0;
-    private volatile long p21, p22, p23, p24, p25, p26, p27, p28 = 8;
 
+    private volatile long $pad31, $pad32, $pad33, $pad34, $pad35, $pad36, $pad37, $pad38 = 9;
     private long lastHeadObserved = 0;
-    private volatile long p31, p32, p33, p34, p35, p36, p37, p38 = 9;
+    private volatile long $pad41, $pad42, $pad43, $pad44, $pad45, $pad46, $pad47, $pad48 = 9;
     private long lastTailObserved = 0;
+    private volatile long $pad51, $pad52, $pad53, $pad54, $pad55, $pad56, $pad57, $pad58 = 9;
 
 
     public long sumPaddingToPreventOptimisation() {
-        return p11 + p12 + p13 + p14 + p15 + p16 + p17 + p18
-                + p21 + p22 + p23 + p24 + p25 + p26 + p27 + p28
-                + p31 + p32 + p33 + p34 + p35 + p36 + p37 + p38;
+        try {
+            long sum = 0;
+            for ( final Field field : getClass().getFields() ) {
+                if ( field.getName().startsWith( "$pad" ) && field.getType() == long.class ) {
+                    final Number value = ( Number ) field.get( this );
+                    sum += value.longValue();
+                }
+            }
+            return sum;
+        } catch ( IllegalAccessException e ) {
+            return 0;
+        }
     }
 

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedSpinOptimizedUnrolledQueue.java

@@ -1 +1 @@
 package test.threads.queue.unstressed.impl;
 
+import java.lang.reflect.Field;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
@@ -35 +36 @@
 
     private final int length;
-    public volatile long p11, p12, p13, p14, p15, p16, p17, p18 = 7;
+
+    public volatile long $pad11, $pad12, $pad13, $pad14, $pad15, $pad16, $pad17, $pad18 = 7;
     private volatile long headCursor = 0;
-    public volatile long p21, p22, p23, p24, p25, p26, p27, p28 = 7;
+    public volatile long $pad21, $pad22, $pad23, $pad24, $pad25, $pad26, $pad27, $pad28 = 7;
     private volatile long tailCursor = 0;
-    public volatile long p31, p32, p33, p34, p35, p36, p37, p38 = 8;
+    public volatile long $pad31, $pad32, $pad33, $pad34, $pad35, $pad36, $pad37, $pad38 = 8;
 
     private long lastHeadObserved = 0;
-    public volatile long p41, p42, p43, p44, p45, p46, p47, p48 = 9;
+    public volatile long $pad41, $pad42, $pad43, $pad44, $pad45, $pad46, $pad47, $pad48 = 9;
     private long lastTailObserved = 0;
+    public volatile long $pad51, $pad52, $pad53, $pad54, $pad55, $pad56, $pad57, $pad58 = 9;
 
 
@@ -49 +52 @@
 
     public long sumPaddingToPreventOptimisation() {
-        return p11 + p12 + p13 + p14 + p15 + p16 + p17 + p18
-                + p21 + p22 + p23 + p24 + p25 + p26 + p27 + p28
-                + p31 + p32 + p33 + p34 + p35 + p36 + p37 + p38
-                + p41 + p42 + p43 + p44 + p45 + p46 + p47 + p48;
+        try {
+            long sum = 0;
+            for ( final Field field : getClass().getFields() ) {
+                if ( field.getName().startsWith( "$pad" ) && field.getType() == long.class ) {
+                    final Number value = ( Number ) field.get( this );
+                    sum += value.longValue();
+                }
+            }
+            return sum;
+        } catch ( IllegalAccessException e ) {
+            return 0;
+        }
     }
 

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetPaddedUnrolledQueue.java

@@ -1 +1 @@
 package test.threads.queue.unstressed.impl;
 
+import java.lang.reflect.Field;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
@@ -35 +36 @@
 
     private final int length;
-    public volatile long p11, p12, p13, p14, p15, p16, p17, p18 = 7;
+    public volatile long $pad11, $pad12, $pad13, $pad14, $pad15, $pad16, $pad17, $pad18 = 7;
     private volatile long headCursor = 0;
-    public volatile long p21, p22, p23, p24, p25, p26, p27, p28 = 7;
+    public volatile long $pad21, $pad22, $pad23, $pad24, $pad25, $pad26, $pad27, $pad28 = 7;
     private volatile long tailCursor = 0;
-    public volatile long p31, p32, p33, p34, p35, p36, p37, p38 = 8;
+    public volatile long $pad31, $pad32, $pad33, $pad34, $pad35, $pad36, $pad37, $pad38 = 8;
 
     public long sumPaddingToPreventOptimisation() {
-        return p11 + p12 + p13 + p14 + p15 + p16 + p17 + p18
-                + p21 + p22 + p23 + p24 + p25 + p26 + p27 + p28
-                + p31 + p32 + p33 + p34 + p35 + p36 + p37 + p38;
+        try {
+            long sum = 0;
+            for ( final Field field : getClass().getFields() ) {
+                if ( field.getName().startsWith( "$pad" ) && field.getType() == long.class ) {
+                    final Number value = ( Number ) field.get( this );
+                    sum += value.longValue();
+                }
+            }
+            return sum;
+        } catch ( IllegalAccessException e ) {
+            return 0;
+        }
     }
 

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl/CABSESDLazySetUnrolledQueue.java

@@ -36 +36 @@
     private final int length;
     private volatile long headCursor = 0;
-    //    private volatile long p11, p12, p13, p14, p15, p16, p17, p18 = 7;
     private volatile long tailCursor = 0;
-//    private volatile long p21, p22, p23, p24, p25, p26, p27, p28 = 8;
-
-    public long sumPaddingToPreventOptimisation() {
-//        return p11 + p12 + p13 + p14 + p15 + p16 + p17 + p18
-//                + p21 + p22 + p23 + p24 + p25 + p26 + p27 + p28;
-        return 0;
-    }
 
     private final T[] elements;
@@ -56 +48 @@
         this.length = length;
         elements = ( T[] ) new Object[length];
-        sumPaddingToPreventOptimisation();
     }