Renamed DiagnosticThunkRegister to DiagnosticThunkRegistry.

Author: christianhaeubl

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjectVisitor.java

@@ -34,7 +34,7 @@
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunk;
-import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegister;
+import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegistry;
 import com.oracle.svm.core.SubstrateDiagnostics.ErrorContext;
 import com.oracle.svm.core.annotate.AlwaysInline;
 import com.oracle.svm.core.annotate.NeverInline;
@@ -62,7 +62,7 @@ public final class GreyToBlackObjectVisitor implements ObjectVisitor {
         this.objRefVisitor = greyToBlackObjRefVisitor;
         if (DiagnosticReporter.getHistoryLength() > 0) {
             this.diagnosticReporter = new DiagnosticReporter();
-            DiagnosticThunkRegister.getSingleton().register(diagnosticReporter);
+            DiagnosticThunkRegistry.singleton().register(diagnosticReporter);
         } else {
             this.diagnosticReporter = null;
         }

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java

@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegistry;
 import com.oracle.svm.core.SubstrateDiagnostics.ErrorContext;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
@@ -119,8 +120,8 @@ public HeapImpl(int pageSize) {
         this.gcImpl = new GCImpl();
         this.runtimeCodeInfoGcSupport = new RuntimeCodeInfoGCSupportImpl();
         HeapParameters.initialize();
-        SubstrateDiagnostics.DiagnosticThunkRegister.getSingleton().register(new DumpHeapSettingsAndStatistics());
-        SubstrateDiagnostics.DiagnosticThunkRegister.getSingleton().register(new DumpChunkInformation());
+        DiagnosticThunkRegistry.singleton().register(new DumpHeapSettingsAndStatistics());
+        DiagnosticThunkRegistry.singleton().register(new DumpChunkInformation());
     }
 
     @Fold

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java

@@ -106,7 +106,7 @@ public static boolean isFatalErrorHandlingThread() {
 
     public static int maxInvocations() {
         int result = 0;
-        DiagnosticThunkRegister thunks = DiagnosticThunkRegister.getSingleton();
+        DiagnosticThunkRegistry thunks = DiagnosticThunkRegistry.singleton();
         for (int i = 0; i < thunks.size(); i++) {
             result += thunks.getThunk(i).maxInvocationCount();
         }
@@ -142,10 +142,10 @@ public static void printInformation(Log log, Pointer sp, CodePointer ip, Registe
         errorContext.setFrameHasCalleeSavedRegisters(frameHasCalleeSavedRegisters);
 
         // Print all thunks in a reasonably safe way.
-        int numDiagnosticThunks = DiagnosticThunkRegister.getSingleton().size();
+        int numDiagnosticThunks = DiagnosticThunkRegistry.singleton().size();
         for (int i = 0; i < numDiagnosticThunks; i++) {
-            DiagnosticThunk thunk = DiagnosticThunkRegister.getSingleton().getThunk(i);
-            int invocationCount = DiagnosticThunkRegister.getSingleton().getInitialInvocationCount(i);
+            DiagnosticThunk thunk = DiagnosticThunkRegistry.singleton().getThunk(i);
+            int invocationCount = DiagnosticThunkRegistry.singleton().getInitialInvocationCount(i);
             if (invocationCount <= thunk.maxInvocationCount()) {
                 thunk.printDiagnostics(log, errorContext, DiagnosticLevel.SAFE, invocationCount);
             }
@@ -202,14 +202,14 @@ private static void printFatalErrorForCurrentState() {
         // Print the various sections of the diagnostics and skip all sections that were already
         // printed earlier.
         ErrorContext errorContext = fatalErrorState.getErrorContext();
-        int numDiagnosticThunks = DiagnosticThunkRegister.getSingleton().size();
+        int numDiagnosticThunks = DiagnosticThunkRegistry.singleton().size();
         while (fatalErrorState.diagnosticThunkIndex < numDiagnosticThunks) {
             int index = fatalErrorState.diagnosticThunkIndex;
-            DiagnosticThunk thunk = DiagnosticThunkRegister.getSingleton().getThunk(index);
+            DiagnosticThunk thunk = DiagnosticThunkRegistry.singleton().getThunk(index);
 
             // Start at the configured initial invocation count.
             if (fatalErrorState.invocationCount == 0) {
-                fatalErrorState.invocationCount = DiagnosticThunkRegister.getSingleton().getInitialInvocationCount(index) - 1;
+                fatalErrorState.invocationCount = DiagnosticThunkRegistry.singleton().getInitialInvocationCount(index) - 1;
             }
 
             while (++fatalErrorState.invocationCount <= thunk.maxInvocationCount()) {
@@ -322,13 +322,13 @@ private static void updateInitialInvocationCount(String entry) throws IllegalArg
         int initialInvocationCount = parseInvocationCount(entry, pos);
 
         int matches = 0;
-        int numDiagnosticThunks = DiagnosticThunkRegister.getSingleton().size();
+        int numDiagnosticThunks = DiagnosticThunkRegistry.singleton().size();
         for (int i = 0; i < numDiagnosticThunks; i++) {
-            DiagnosticThunk thunk = DiagnosticThunkRegister.getSingleton().getThunk(i);
+            DiagnosticThunk thunk = DiagnosticThunkRegistry.singleton().getThunk(i);
             // Checkstyle: allow Class.getSimpleName
             if (matches(thunk.getClass().getSimpleName(), pattern)) {
                 // Checkstyle: disallow Class.getSimpleName
-                DiagnosticThunkRegister.getSingleton().setInitialInvocationCount(i, initialInvocationCount);
+                DiagnosticThunkRegistry.singleton().setInitialInvocationCount(i, initialInvocationCount);
                 matches++;
             }
         }
@@ -898,27 +898,22 @@ public abstract static class DiagnosticThunk {
         public abstract int maxInvocationCount();
     }
 
-    public static class DiagnosticThunkRegister {
+    public static class DiagnosticThunkRegistry {
         private DiagnosticThunk[] diagnosticThunks;
         private int[] initialInvocationCount;
 
-        /**
-         * Get the register.
-         * <p>
-         * This method is @Fold so anyone who uses it ensures there is a register.
-         */
         @Fold
         /* Checkstyle: allow synchronization. */
-        public static synchronized DiagnosticThunkRegister getSingleton() {
-            if (!ImageSingletons.contains(DiagnosticThunkRegister.class)) {
-                ImageSingletons.add(DiagnosticThunkRegister.class, new DiagnosticThunkRegister());
+        public static synchronized DiagnosticThunkRegistry singleton() {
+            if (!ImageSingletons.contains(DiagnosticThunkRegistry.class)) {
+                ImageSingletons.add(DiagnosticThunkRegistry.class, new DiagnosticThunkRegistry());
             }
-            return ImageSingletons.lookup(DiagnosticThunkRegister.class);
+            return ImageSingletons.lookup(DiagnosticThunkRegistry.class);
         }
         /* Checkstyle: disallow synchronization. */
 
         @Platforms(Platform.HOSTED_ONLY.class)
-        DiagnosticThunkRegister() {
+        DiagnosticThunkRegistry() {
             this.diagnosticThunks = new DiagnosticThunk[]{new DumpRegisters(), new DumpInstructions(), new DumpTopOfCurrentThreadStack(), new DumpDeoptStubPointer(), new DumpTopFrame(),
                             new DumpThreads(), new DumpCurrentThreadLocals(), new DumpCurrentVMOperation(), new DumpVMOperationHistory(), new DumpCodeCacheHistory(),
                             new DumpRuntimeCodeInfoMemory(), new DumpRecentDeoptimizations(), new DumpCounters(), new DumpCurrentThreadFrameAnchors(), new DumpCurrentThreadDecodedStackTrace(),

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateDiagnosticFeature.java

@@ -30,7 +30,7 @@
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
-import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegister;
+import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegistry;
 import com.oracle.svm.core.SubstrateDiagnostics.FatalErrorState;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
@@ -44,7 +44,7 @@ public void duringSetup(DuringSetupAccess access) {
         ImageSingletons.add(FatalErrorState.class, new FatalErrorState());
 
         // Ensure that the diagnostic thunks are initialized.
-        DiagnosticThunkRegister.getSingleton();
+        DiagnosticThunkRegistry.singleton();
     }
 
     @Override