[GR-68724] Report watchdog activity in RestrictHeapAccessCalleesImpl.aggregateMethods.

PullRequest: graal/21860

Author: wirthi

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

@@ -841,7 +841,10 @@ protected boolean runPointsToAnalysis(String imageName, OptionValues options, De
                     bb.runAnalysis(debug, (universe) -> {
                         try (StopTimer t2 = TimerCollection.createTimerAndStart(TimerCollection.Registry.FEATURES)) {
                             bb.getHostVM().notifyClassReachabilityListener(universe, config);
-                            featureHandler.forEachFeature(feature -> feature.duringAnalysis(config));
+                            featureHandler.forEachFeature(feature -> {
+                                feature.duringAnalysis(config);
+                                loader.watchdog.recordActivity();
+                            });
                         }
                         /* Analysis is finished if no additional iteration was requested. */
                         return !config.getAndResetRequireAnalysisIteration() && !concurrentConfig.getAndResetRequireAnalysisIteration();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessCalleesImpl.java

@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.oracle.svm.hosted.DeadlockWatchdog;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableEconomicSet;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -107,13 +108,16 @@ public Map<AnalysisMethod, RestrictionInfo> getCallerMap() {
     public void aggregateMethods(Collection<AnalysisMethod> methods) {
         assert !initialized : "RestrictHeapAccessCallees.aggregateMethods: Should only initialize once.";
         Map<AnalysisMethod, RestrictionInfo> aggregation = new HashMap<>();
+        DeadlockWatchdog watchdog = DeadlockWatchdog.singleton();
+        watchdog.recordActivity();
         for (AnalysisMethod method : methods) {
             if (method.isAnnotationPresent(RestrictHeapAccess.class)) {
                 setMethodRestrictionInfo(method, aggregation);
             }
         }
         MethodAggregator visitor = new MethodAggregator(aggregation, assertionErrorConstructorList);
         AnalysisMethodCalleeWalker walker = new AnalysisMethodCalleeWalker();
+        watchdog.recordActivity();
         for (AnalysisMethod method : aggregation.keySet().toArray(AnalysisMethod.EMPTY_ARRAY)) {
             walker.walkMethod(method, visitor);
         }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java

@@ -44,6 +44,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.oracle.svm.hosted.DeadlockWatchdog;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -149,6 +150,7 @@ public UniverseBuilder(AnalysisUniverse aUniverse, AnalysisMetaAccess aMetaAcces
     @SuppressWarnings("try")
     public void build(DebugContext debug) {
         aUniverse.seal();
+        DeadlockWatchdog.singleton().recordActivity();
 
         try (Indent indent = debug.logAndIndent("build universe")) {
             for (AnalysisType aType : aUniverse.getTypes()) {
@@ -193,6 +195,7 @@ public void build(DebugContext debug) {
                 });
             }
 
+            DeadlockWatchdog.singleton().recordActivity();
             HostedConfiguration.initializeDynamicHubLayout(hMetaAccess);
 
             Collection<HostedType> allTypes = hUniverse.types.values();