tests, type repo, sync, periodic events

final cleanup

refactor

gate formatting fix

minor refactor

Author: roberttoyonaga

substratevm/mx.substratevm/suite.py

@@ -336,6 +336,7 @@
             ],
             "requires" : [
                 "jdk.management",
+                "jdk.jfr",
             ],
             "requiresConcealed" : {
                 "java.base": [

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2023, Red Hat Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.core.genscavenge;
+
+import com.oracle.svm.core.Uninterruptible;
+import com.oracle.svm.core.heap.GCCause;
+import com.oracle.svm.core.jfr.JfrEvent;
+import com.oracle.svm.core.jfr.events.ObjectCountEventSupport;
+import jdk.jfr.Event;
+import jdk.jfr.Name;
+import jdk.jfr.Period;
+
+@Name("EveryChunkPeriodicGCEvents")
+@Period(value = "everyChunk")
+public class EveryChunkNativeGCPeriodicEvents extends Event {
+
+    public static void emit() {
+        emitObjectCount();
+    }
+
+    @Uninterruptible(reason = "Set and unset should be atomic with invoked GC to avoid races.")
+    private static void emitObjectCount() {
+        if (JfrEvent.ObjectCount.shouldEmit()) {
+            ObjectCountEventSupport.setShouldSendRequestableEvent(true);
+            GCImpl.getGCImpl().collectWithoutAllocating(GCCause.JfrObjectCount, true);
+            ObjectCountEventSupport.setShouldSendRequestableEvent(false);
+        }
+    }
+}

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

@@ -82,6 +82,7 @@
 import com.oracle.svm.core.jfr.JfrGCWhen;
 import com.oracle.svm.core.jfr.JfrTicks;
 import com.oracle.svm.core.jfr.events.AllocationRequiringGCEvent;
+import com.oracle.svm.core.jfr.events.ObjectCountEventSupport;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.os.CommittedMemoryProvider;
 import com.oracle.svm.core.snippets.ImplicitExceptions;
@@ -177,7 +178,7 @@ private void collect(GCCause cause, boolean forceFullGC) {
 
     @Uninterruptible(reason = "Avoid races with other threads that also try to trigger a GC")
     @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate in the implementation of garbage collection.")
-    boolean collectWithoutAllocating(GCCause cause, boolean forceFullGC) {
+    public boolean collectWithoutAllocating(GCCause cause, boolean forceFullGC) {
         VMError.guarantee(!hasNeverCollectPolicy());
 
         int size = SizeOf.get(CollectionVMOperationData.class);
@@ -244,6 +245,7 @@ private boolean collectImpl(GCCause cause, long requestingNanoTime, boolean forc
             }
         } finally {
             JfrGCEvents.emitGarbageCollectionEvent(getCollectionEpoch(), cause, startTicks);
+            ObjectCountEventSupport.emitEvents((int) getCollectionEpoch().rawValue(), startTicks);
         }
         return outOfMemory;
     }

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

@@ -25,10 +25,12 @@
  */
 package com.oracle.svm.core.genscavenge;
 
+import jdk.jfr.FlightRecorder;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.word.UnsignedWord;
 
+import com.oracle.svm.core.jdk.RuntimeSupport;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
@@ -136,6 +138,18 @@ private int popPhase() {
         assert currentPhase > 0;
         return --currentPhase;
     }
+
+    public static RuntimeSupport.Hook startupHook() {
+        return isFirstIsolate -> {
+            FlightRecorder.addPeriodicEvent(EveryChunkNativeGCPeriodicEvents.class, EveryChunkNativeGCPeriodicEvents::emit);
+        };
+    }
+
+    public static RuntimeSupport.Hook shutdownHook() {
+        return isFirstIsolate -> {
+            FlightRecorder.removePeriodicEvent(EveryChunkNativeGCPeriodicEvents::emit);
+        };
+    }
 }
 
 @AutomaticallyRegisteredFeature
@@ -150,6 +164,10 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
         if (HasJfrSupport.get()) {
             JfrGCName name = JfrGCNames.singleton().addGCName("serial");
             ImageSingletons.add(JfrGCEventSupport.class, new JfrGCEventSupport(name));
+
+            RuntimeSupport runtime = RuntimeSupport.getRuntimeSupport();
+            runtime.addStartupHook(JfrGCEventSupport.startupHook());
+            runtime.addShutdownHook(JfrGCEventSupport.shutdownHook());
         }
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/GCCause.java

@@ -49,6 +49,7 @@ public class GCCause {
     @DuplicatedInNativeCode public static final GCCause HintedGC = new GCCause("Hinted GC", 3);
     @DuplicatedInNativeCode public static final GCCause JvmtiForceGC = new GCCause("JvmtiEnv ForceGarbageCollection", 4);
     @DuplicatedInNativeCode public static final GCCause HeapDump = new GCCause("Heap Dump Initiated GC ", 5);
+    @DuplicatedInNativeCode public static final GCCause JfrObjectCount = new GCCause("Required for JFR object counting", 6);
 
     @UnknownObjectField(availability = ReadyForCompilation.class) protected static GCCause[] GCCauses;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubSupport.java

@@ -50,7 +50,6 @@ public void setMaxTypeId(int maxTypeId) {
         this.maxTypeId = maxTypeId;
     }
 
-    @Platforms(Platform.HOSTED_ONLY.class)
     public int getMaxTypeId() {
         return maxTypeId;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrTypeRepository.java

@@ -102,15 +102,20 @@ private TypeInfo collectTypeInfo(boolean flushpoint) {
         return typeInfo;
     }
 
+    boolean isClassGenerated(Class<?> clazz) {
+        return clazz != null && clazz.getPackage() != null && clazz.getPackage().getName().equals("jdk.internal.reflect") && clazz.getName().contains("GeneratedSerializationConstructorAccessor");
+    }
+
     private void visitClass(TypeInfo typeInfo, Class<?> clazz) {
-        if (clazz != null && addClass(typeInfo, clazz)) {
-            visitPackage(typeInfo, clazz.getPackage(), clazz.getModule());
+        if ((clazz != null && addClass(typeInfo, clazz))) {
+            visitPackage(typeInfo, clazz.getPackage(), clazz.getModule(), isClassGenerated(clazz));
             visitClass(typeInfo, clazz.getSuperclass());
+            visitClassLoader(typeInfo, clazz.getClassLoader());
         }
     }
 
-    private void visitPackage(TypeInfo typeInfo, Package pkg, Module module) {
-        if (pkg != null && addPackage(typeInfo, pkg, module)) {
+    private void visitPackage(TypeInfo typeInfo, Package pkg, Module module, boolean generated) {
+        if (pkg != null && addPackage(typeInfo, pkg, module, generated)) {
             visitModule(typeInfo, module);
         }
     }
@@ -246,10 +251,14 @@ private boolean isClassVisited(TypeInfo typeInfo, Class<?> clazz) {
         return typeInfo.classes.contains(clazz) || flushedClasses.contains(clazz);
     }
 
-    private boolean addPackage(TypeInfo typeInfo, Package pkg, Module module) {
+    private boolean addPackage(TypeInfo typeInfo, Package pkg, Module module, boolean generated) {
         if (isPackageVisited(typeInfo, pkg)) {
-            assert module == (flushedPackages.containsKey(pkg.getName()) ? flushedPackages.get(pkg.getName()).module : typeInfo.packages.get(pkg.getName()).module);
-            return false;
+            Module cached = (flushedPackages.containsKey(pkg.getName()) ? flushedPackages.get(pkg.getName()).module : typeInfo.packages.get(pkg.getName()).module);
+            if (cached.isNamed() || !module.isNamed()) {
+                assert module == cached || (generated && !module.isNamed());
+                return false;
+            }
+            assert module != cached && !generated;
         }
         // The empty package represented by "" is always traced with id 0
         long id = pkg.getName().isEmpty() ? 0 : ++currentPackageId;