report watchdog activity in RestrictHeapAccessCalleesImpl.aggregateMethods

Author: wirthi

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,14 +108,17 @@ 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();
         for (AnalysisMethod method : methods) {
+            watchdog.recordActivity();
             if (method.isAnnotationPresent(RestrictHeapAccess.class)) {
                 setMethodRestrictionInfo(method, aggregation);
             }
         }
         MethodAggregator visitor = new MethodAggregator(aggregation, assertionErrorConstructorList);
         AnalysisMethodCalleeWalker walker = new AnalysisMethodCalleeWalker();
         for (AnalysisMethod method : aggregation.keySet().toArray(AnalysisMethod.EMPTY_ARRAY)) {
+            watchdog.recordActivity();
             walker.walkMethod(method, visitor);
         }
         calleeToCallerMap = Collections.unmodifiableMap(aggregation);