changeset 212:9270b927e00f

singletons: rename factories.
author shade
date Sat, 27 Sep 2014 22:02:53 +0400
parents 6162f1945f88
children 3b6a31d64cd3
files tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeDCL.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeLocalDCL.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SynchronizedCL.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeDCL.java tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeLocalDCL.java
diffstat 5 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeDCL.java	Sat Sep 27 21:46:24 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeDCL.java	Sat Sep 27 22:02:53 2014 +0400
@@ -43,12 +43,12 @@
     @JCStressMeta(GradingSafe.class)
     public static class Unsafe {
         @Actor
-        public final void actor1(SafeSingletonFactory s) {
+        public final void actor1(SafeDCLFactory s) {
             s.getInstance(SingletonUnsafe::new);
         }
 
         @Actor
-        public final void actor2(SafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(SafeDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonUnsafe::new));
         }
     }
@@ -57,18 +57,18 @@
     @JCStressMeta(GradingSafe.class)
     public static class Safe {
         @Actor
-        public final void actor1(SafeSingletonFactory s) {
+        public final void actor1(SafeDCLFactory s) {
             s.getInstance(SingletonSafe::new);
         }
 
         @Actor
-        public final void actor2(SafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(SafeDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonSafe::new));
         }
     }
 
     @State
-    public static class SafeSingletonFactory {
+    public static class SafeDCLFactory {
         private volatile Singleton instance;
 
         public Singleton getInstance(Supplier<Singleton> s) {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeLocalDCL.java	Sat Sep 27 21:46:24 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SafeLocalDCL.java	Sat Sep 27 22:02:53 2014 +0400
@@ -43,12 +43,12 @@
     @JCStressMeta(GradingSafe.class)
     public static class Unsafe {
         @Actor
-        public final void actor1(SafeSingletonFactory s) {
+        public final void actor1(SafeLocalDCLFactory s) {
             s.getInstance(SingletonUnsafe::new);
         }
 
         @Actor
-        public final void actor2(SafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(SafeLocalDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonUnsafe::new));
         }
     }
@@ -57,18 +57,18 @@
     @JCStressMeta(GradingSafe.class)
     public static class Safe {
         @Actor
-        public final void actor1(SafeSingletonFactory s) {
+        public final void actor1(SafeLocalDCLFactory s) {
             s.getInstance(SingletonSafe::new);
         }
 
         @Actor
-        public final void actor2(SafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(SafeLocalDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonSafe::new));
         }
     }
 
     @State
-    public static class SafeSingletonFactory {
+    public static class SafeLocalDCLFactory {
         private volatile Singleton instance;
 
         public Singleton getInstance(Supplier<Singleton> s) {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SynchronizedCL.java	Sat Sep 27 21:46:24 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/SynchronizedCL.java	Sat Sep 27 22:02:53 2014 +0400
@@ -43,12 +43,12 @@
     @JCStressMeta(GradingSafe.class)
     public static class Unsafe {
         @Actor
-        public final void actor1(SafeSingletonFactory s) {
+        public final void actor1(SynchronizedCLFactory s) {
             s.getInstance(SingletonUnsafe::new);
         }
 
         @Actor
-        public final void actor2(SafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(SynchronizedCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonUnsafe::new));
         }
     }
@@ -57,18 +57,18 @@
     @JCStressMeta(GradingSafe.class)
     public static class Safe {
         @Actor
-        public final void actor1(SafeSingletonFactory s) {
+        public final void actor1(SynchronizedCLFactory s) {
             s.getInstance(SingletonSafe::new);
         }
 
         @Actor
-        public final void actor2(SafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(SynchronizedCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonSafe::new));
         }
     }
 
     @State
-    public static class SafeSingletonFactory {
+    public static class SynchronizedCLFactory {
         private Singleton instance;
 
         public Singleton getInstance(Supplier<Singleton> s) {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeDCL.java	Sat Sep 27 21:46:24 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeDCL.java	Sat Sep 27 22:02:53 2014 +0400
@@ -43,12 +43,12 @@
     @JCStressMeta(GradingUnsafe.class)
     public static class Unsafe {
         @Actor
-        public final void actor1(UnsafeSingletonFactory s) {
+        public final void actor1(UnsafeDCLFactory s) {
             s.getInstance(SingletonUnsafe::new);
         }
 
         @Actor
-        public final void actor2(UnsafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(UnsafeDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonUnsafe::new));
         }
     }
@@ -57,18 +57,18 @@
     @JCStressMeta(GradingUnsafe.class)
     public static class Safe {
         @Actor
-        public final void actor1(UnsafeSingletonFactory s) {
+        public final void actor1(UnsafeDCLFactory s) {
             s.getInstance(SingletonSafe::new);
         }
 
         @Actor
-        public final void actor2(UnsafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(UnsafeDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonSafe::new));
         }
     }
 
     @State
-    public static class UnsafeSingletonFactory {
+    public static class UnsafeDCLFactory {
         private Singleton instance; // specifically non-volatile
 
         public Singleton getInstance(Supplier<Singleton> s) {
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeLocalDCL.java	Sat Sep 27 21:46:24 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/singletons/UnsafeLocalDCL.java	Sat Sep 27 22:02:53 2014 +0400
@@ -43,12 +43,12 @@
     @JCStressMeta(GradingUnsafe.class)
     public static class Unsafe {
         @Actor
-        public final void actor1(UnsafeSingletonFactory s) {
+        public final void actor1(UnsafeLocalDCLFactory s) {
             s.getInstance(SingletonUnsafe::new);
         }
 
         @Actor
-        public final void actor2(UnsafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(UnsafeLocalDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonUnsafe::new));
         }
     }
@@ -57,18 +57,18 @@
     @JCStressMeta(GradingSafe.class)
     public static class Safe {
         @Actor
-        public final void actor1(UnsafeSingletonFactory s) {
+        public final void actor1(UnsafeLocalDCLFactory s) {
             s.getInstance(SingletonSafe::new);
         }
 
         @Actor
-        public final void actor2(UnsafeSingletonFactory s, IntResult1 r) {
+        public final void actor2(UnsafeLocalDCLFactory s, IntResult1 r) {
             r.r1 = Singleton.map(s.getInstance(SingletonSafe::new));
         }
     }
 
     @State
-    public static class UnsafeSingletonFactory {
+    public static class UnsafeLocalDCLFactory {
         private Singleton instance; // specifically non-volatile
 
         public Singleton getInstance(Supplier<Singleton> s) {