changeset 362:8f81e562fbf5

Yak shaving: Make padding subclasses abstract.
author shade
date Thu, 23 Jan 2014 00:20:04 +0400
parents 77ac1de4a238
children 1406e1e592a9
files jmh-core/src/main/java/org/openjdk/jmh/logic/BlackHole.java jmh-core/src/main/java/org/openjdk/jmh/logic/Control.java jmh-core/src/main/java/org/openjdk/jmh/logic/InfraControl.java jmh-core/src/main/java/org/openjdk/jmh/logic/ThreadControl.java
diffstat 4 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core/src/main/java/org/openjdk/jmh/logic/BlackHole.java	Wed Jan 22 04:40:42 2014 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/logic/BlackHole.java	Thu Jan 23 00:20:04 2014 +0400
@@ -37,11 +37,11 @@
     See the rationale for BlackHoleL1..BlackHoleL4 classes below.
  */
 
-class BlackHoleL0 {
+abstract class BlackHoleL0 {
     public int markerBegin;
 }
 
-class BlackHoleL1 extends BlackHoleL0 {
+abstract class BlackHoleL1 extends BlackHoleL0 {
     private boolean p001, p002, p003, p004, p005, p006, p007, p008;
     private boolean p011, p012, p013, p014, p015, p016, p017, p018;
     private boolean p021, p022, p023, p024, p025, p026, p027, p028;
@@ -60,7 +60,7 @@
     private boolean p171, p172, p173, p174, p175, p176, p177, p178;
 }
 
-class BlackHoleL2 extends BlackHoleL1 {
+abstract class BlackHoleL2 extends BlackHoleL1 {
     public volatile byte b1 = 1, b2 = 2;
     public volatile boolean bool1 = false, bool2 = true;
     public volatile char c1 = 'A', c2 = 'B';
@@ -76,7 +76,7 @@
     public int tlrMask = 1;
 }
 
-class BlackHoleL3 extends BlackHoleL2 {
+abstract class BlackHoleL3 extends BlackHoleL2 {
     private boolean q001, q002, q003, q004, q005, q006, q007, q008;
     private boolean q011, q012, q013, q014, q015, q016, q017, q018;
     private boolean q021, q022, q023, q024, q025, q026, q027, q028;
@@ -95,7 +95,7 @@
     private boolean q171, q172, q173, q174, q175, q176, q177, q178;
 }
 
-class BlackHoleL4 extends BlackHoleL3 {
+abstract class BlackHoleL4 extends BlackHoleL3 {
     public int markerEnd;
 }
 
--- a/jmh-core/src/main/java/org/openjdk/jmh/logic/Control.java	Wed Jan 22 04:40:42 2014 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/logic/Control.java	Thu Jan 23 00:20:04 2014 +0400
@@ -38,11 +38,11 @@
 
 }
 
-class ControlL0 {
+abstract class ControlL0 {
     public int markerBegin;
 }
 
-class ControlL1 extends ControlL0 {
+abstract class ControlL1 extends ControlL0 {
     private boolean p001, p002, p003, p004, p005, p006, p007, p008;
     private boolean p011, p012, p013, p014, p015, p016, p017, p018;
     private boolean p021, p022, p023, p024, p025, p026, p027, p028;
@@ -61,7 +61,7 @@
     private boolean p171, p172, p173, p174, p175, p176, p177, p178;
 }
 
-class ControlL2 extends ControlL1 {
+abstract class ControlL2 extends ControlL1 {
 
     @Setup(Level.Iteration)
     public void setup() {
@@ -85,7 +85,7 @@
     public volatile long iterationTime;
 }
 
-class ControlL3 extends ControlL2 {
+abstract class ControlL3 extends ControlL2 {
     private boolean q001, q002, q003, q004, q005, q006, q007, q008;
     private boolean q011, q012, q013, q014, q015, q016, q017, q018;
     private boolean q021, q022, q023, q024, q025, q026, q027, q028;
--- a/jmh-core/src/main/java/org/openjdk/jmh/logic/InfraControl.java	Wed Jan 22 04:40:42 2014 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/logic/InfraControl.java	Thu Jan 23 00:20:04 2014 +0400
@@ -134,11 +134,11 @@
     }
 }
 
-class InfraControlL0 {
+abstract class InfraControlL0 {
     public int markerBegin;
 }
 
-class InfraControlL1 extends InfraControlL0 {
+abstract class InfraControlL1 extends InfraControlL0 {
     private boolean p001, p002, p003, p004, p005, p006, p007, p008;
     private boolean p011, p012, p013, p014, p015, p016, p017, p018;
     private boolean p021, p022, p023, p024, p025, p026, p027, p028;
@@ -160,7 +160,7 @@
 /**
  * @see BlackHole for rationale
  */
-class InfraControlL2 extends InfraControlL1 {
+abstract class InfraControlL2 extends InfraControlL1 {
     /* Flag for if we are done or not.
      * This is specifically the public field, so to spare one virtual call.
      */
@@ -220,7 +220,7 @@
 
 }
 
-class InfraControlL3 extends InfraControlL2 {
+abstract class InfraControlL3 extends InfraControlL2 {
     private boolean q001, q002, q003, q004, q005, q006, q007, q008;
     private boolean q011, q012, q013, q014, q015, q016, q017, q018;
     private boolean q021, q022, q023, q024, q025, q026, q027, q028;
@@ -243,7 +243,7 @@
     }
 }
 
-class InfraControlL4 extends InfraControlL3 {
+abstract class InfraControlL4 extends InfraControlL3 {
     public int markerEnd;
 
     public InfraControlL4(int threads, boolean syncIterations, TimeValue loopTime, CountDownLatch preSetup, CountDownLatch preTearDown, boolean lastIteration, TimeUnit timeUnit) {
--- a/jmh-core/src/main/java/org/openjdk/jmh/logic/ThreadControl.java	Wed Jan 22 04:40:42 2014 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/logic/ThreadControl.java	Thu Jan 23 00:20:04 2014 +0400
@@ -35,11 +35,11 @@
     }
 }
 
-class ThreadControlL0 {
+abstract class ThreadControlL0 {
     public int markerBegin;
 }
 
-class ThreadControlL1 extends ThreadControlL0 {
+abstract class ThreadControlL1 extends ThreadControlL0 {
     private boolean p001, p002, p003, p004, p005, p006, p007, p008;
     private boolean p011, p012, p013, p014, p015, p016, p017, p018;
     private boolean p021, p022, p023, p024, p025, p026, p027, p028;
@@ -58,7 +58,7 @@
     private boolean p171, p172, p173, p174, p175, p176, p177, p178;
 }
 
-class ThreadControlL2 extends ThreadControlL1 {
+abstract class ThreadControlL2 extends ThreadControlL1 {
     public final int group;
     public final int subgroup;
 
@@ -68,7 +68,7 @@
     }
 }
 
-class ThreadControlL3 extends ThreadControlL2 {
+abstract class ThreadControlL3 extends ThreadControlL2 {
     private boolean q001, q002, q003, q004, q005, q006, q007, q008;
     private boolean q011, q012, q013, q014, q015, q016, q017, q018;
     private boolean q021, q022, q023, q024, q025, q026, q027, q028;