Style and test fixes.

Author: christianhaeubl

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

@@ -40,6 +40,7 @@
 import com.oracle.svm.core.option.APIOption;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.option.LocatableMultiOptionValue;
+import com.oracle.svm.core.option.RuntimeOptionKey;
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.util.LogUtils;
@@ -77,6 +78,13 @@ public final class VMInspectionOptions {
     public static final HostedOptionKey<LocatableMultiOptionValue.Strings> EnableMonitoringFeatures = new HostedOptionKey<>(LocatableMultiOptionValue.Strings.buildWithCommaDelimiter(),
                     VMInspectionOptions::validateEnableMonitoringFeatures);
 
+    @Option(help = "Dumps all runtime compiled methods on SIGUSR2.", type = OptionType.User) //
+    public static final HostedOptionKey<Boolean> DumpRuntimeCompilationOnSignal = new HostedOptionKey<>(false);
+
+    // TEMP (chaeubl): change default to true.
+    @Option(help = "Print native memory tracking statistics on shutdown.", type = OptionType.User) //
+    public static final RuntimeOptionKey<Boolean> PrintNMTStatistics = new RuntimeOptionKey<>(false);
+
     @Platforms(Platform.HOSTED_ONLY.class)
     public static void validateEnableMonitoringFeatures(@SuppressWarnings("unused") OptionKey<?> optionKey) {
         Set<String> enabledFeatures = getEnabledMonitoringFeatures();
@@ -173,9 +181,6 @@ public static boolean hasNativeMemoryTrackingSupport() {
         // return hasAllOrKeywordMonitoringSupport(MONITORING_NMT_NAME);
     }
 
-    @Option(help = "Dumps all runtime compiled methods on SIGUSR2.", type = OptionType.User) //
-    public static final HostedOptionKey<Boolean> DumpRuntimeCompilationOnSignal = new HostedOptionKey<>(false);
-
     static class DeprecatedOptions {
         @Option(help = "Enables features that allow the VM to be inspected during run time.", type = OptionType.User, //
                         deprecated = true, deprecationMessage = "Please use '--" + ENABLE_MONITORING_OPTION + "'") //

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java

@@ -35,8 +35,6 @@
 
 import jdk.graal.compiler.api.replacements.Fold;
 
-import jdk.graal.compiler.api.replacements.Fold;
-
 /** Platform-independent LibC support. */
 public class LibC {
     public static final int EXIT_CODE_ABORT = 99;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nmt/NativeMemoryTracking.java

@@ -37,8 +37,8 @@
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
 
-import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.Uninterruptible;
+import com.oracle.svm.core.VMInspectionOptions;
 import com.oracle.svm.core.jdk.RuntimeSupport;
 import com.oracle.svm.core.memory.NativeMemory;
 import com.oracle.svm.core.util.UnsignedUtils;
@@ -147,8 +147,7 @@ public static RuntimeSupport.Hook shutdownHook() {
     }
 
     public void printStatistics() {
-        // TEMP (chaeubl): disable for now
-        if (!SubstrateOptions.DiagnosticDetails.getValue().isEmpty()) {
+        if (VMInspectionOptions.PrintNMTStatistics.getValue()) {
             System.out.println();
             System.out.println("Native memory tracking");
             System.out.println("  Total used memory: " + mallocMemorySnapshot.getTotalInfo().getUsed() + " bytes");

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/debug/CStructTests.java

@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.test.debug;
 
+import org.graalvm.nativeimage.UnmanagedMemory;
 import org.graalvm.nativeimage.c.CContext;
 import org.graalvm.nativeimage.c.struct.CField;
 import org.graalvm.nativeimage.c.struct.CFieldAddress;
@@ -37,8 +38,6 @@
 import org.graalvm.word.SignedWord;
 
 import com.oracle.svm.core.NeverInline;
-import com.oracle.svm.core.memory.NativeMemory;
-import com.oracle.svm.core.nmt.NmtCategory;
 
 import jdk.graal.compiler.api.directives.GraalDirectives;
 
@@ -120,7 +119,7 @@ interface Weird extends PointerBase {
         ])
      */
     public static void weird() {
-        Weird wd = NativeMemory.malloc(SizeOf.get(Weird.class), NmtCategory.Other);
+        Weird wd = UnmanagedMemory.malloc(SizeOf.get(Weird.class));
 
         wd.setf_short((short) 42);
         wd.setf_int(43);
@@ -209,7 +208,7 @@ interface CompositeStruct extends PointerBase {
         ])
      */
     public static void composite() {
-        CompositeStruct cs = NativeMemory.malloc(3 * SizeOf.get(CompositeStruct.class), NmtCategory.Other);
+        CompositeStruct cs = UnmanagedMemory.malloc(3 * SizeOf.get(CompositeStruct.class));
         cs.setC1((byte) 7);
         cs.setC3(13);
         cs.setC5((short) 32000);
@@ -221,8 +220,8 @@ public static void composite() {
     }
 
     public static void mixedArguments() {
-        SimpleStruct ss1 = NativeMemory.malloc(SizeOf.get(SimpleStruct.class), NmtCategory.Other);
-        SimpleStruct2 ss2 = NativeMemory.malloc(SizeOf.get(SimpleStruct2.class), NmtCategory.Other);
+        SimpleStruct ss1 = UnmanagedMemory.malloc(SizeOf.get(SimpleStruct.class));
+        SimpleStruct2 ss2 = UnmanagedMemory.malloc(SizeOf.get(SimpleStruct2.class));
         String m1 = "a message in a bottle";
         String m2 = "a ship in a bottle";
         String m3 = "courage in a bottle";
@@ -252,6 +251,6 @@ public static void main(String[] args) {
 
     @NeverInline("Used as a hook to inspect the caller frame in GDB")
     static void free(PointerBase ptr) {
-        NativeMemory.free(ptr);
+        UnmanagedMemory.free(ptr);
     }
 }

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/nmt/NativeMemoryTrackingTests.java

@@ -39,7 +39,6 @@
 
 public class NativeMemoryTrackingTests {
     private static final int ALLOCATION_SIZE = 1024 * 16;
-    private static final int RESERVE_SIZE = ALLOCATION_SIZE;
     private static final int REALLOC_SIZE = ALLOCATION_SIZE / 2;
 
     @Test