minor refactor

Author: roberttoyonaga

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/EveryChunkNativePeriodicEvents.java

@@ -115,27 +115,30 @@ private static void emitClassLoadingStatistics() {
      */
     private static void emitNativeMemoryTrackingEvents() {
         if (VMInspectionOptions.hasNativeMemoryTrackingSupport()) {
-            /* All NMT events should have a consistent timestamp. */
-            long timestamp = JfrTicks.elapsedTicks();
-            emitNativeMemoryTrackingEvents0(NmtCategory.values(), timestamp);
-
-            NativeMemoryUsageTotalPeakEvent nmtTotalPeakEvent = new NativeMemoryUsageTotalPeakEvent();
-            nmtTotalPeakEvent.countAtPeak = NativeMemoryTracking.singleton().getCountAtTotalPeakUsage();
-            nmtTotalPeakEvent.peakUsage = NativeMemoryTracking.singleton().getPeakTotalUsedMemory();
-            nmtTotalPeakEvent.commit();
-
-            for (NmtCategory nmtCategory : NmtCategory.values()) {
-                NativeMemoryUsagePeakEvent nmtPeakEvent = new NativeMemoryUsagePeakEvent();
-                nmtPeakEvent.type = nmtCategory.getName();
-                nmtPeakEvent.countAtPeak = NativeMemoryTracking.singleton().getCountAtPeakUsage(nmtCategory);
-                nmtPeakEvent.peakUsage = NativeMemoryTracking.singleton().getPeakUsedMemory(nmtCategory);
-                nmtPeakEvent.commit();
-            }
+            emitJdkNmtEvents(NmtCategory.values());
+            emitNmtPeakEvents();
+        }
+    }
+
+    /** These peak events are specific to SubstrateVM. */
+    private static void emitNmtPeakEvents() {
+        NativeMemoryUsageTotalPeakEvent nmtTotalPeakEvent = new NativeMemoryUsageTotalPeakEvent();
+        nmtTotalPeakEvent.countAtPeak = NativeMemoryTracking.singleton().getCountAtTotalPeakUsage();
+        nmtTotalPeakEvent.peakUsage = NativeMemoryTracking.singleton().getPeakTotalUsedMemory();
+        nmtTotalPeakEvent.commit();
+
+        for (NmtCategory nmtCategory : NmtCategory.values()) {
+            NativeMemoryUsagePeakEvent nmtPeakEvent = new NativeMemoryUsagePeakEvent();
+            nmtPeakEvent.type = nmtCategory.getName();
+            nmtPeakEvent.countAtPeak = NativeMemoryTracking.singleton().getCountAtPeakUsage(nmtCategory);
+            nmtPeakEvent.peakUsage = NativeMemoryTracking.singleton().getPeakUsedMemory(nmtCategory);
+            nmtPeakEvent.commit();
         }
     }
 
     @Uninterruptible(reason = "Accesses a JFR buffer.")
-    private static void emitNativeMemoryTrackingEvents0(NmtCategory[] nmtCategories, long timestamp) {
+    private static void emitJdkNmtEvents(NmtCategory[] nmtCategories) {
+        long timestamp = JfrTicks.elapsedTicks();
         JfrNativeEventWriterData data = StackValue.get(JfrNativeEventWriterData.class);
         JfrNativeEventWriterDataAccess.initializeThreadLocalNativeBuffer(data);
 

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestNmtEvents.java

@@ -84,7 +84,8 @@ private static void validateEvents(List<RecordedEvent> events) {
             if (e.getEventType().getName().equals("svm.NativeMemoryUsagePeak") &&
                             e.getString("type").equals(NmtCategory.Code.getName())) {
                 foundNativeMemoryUsagePeak = true;
-            } else if (e.getEventType().getName().equals(JfrEvent.NativeMemoryUsageTotal.getName())) {
+            }
+            if (e.getEventType().getName().equals(JfrEvent.NativeMemoryUsageTotal.getName())) {
                 foundNativeMemoryUsageTotal = true;
             }
         }