Reset watchdog after every 1000 files and print warning after every 20s

guizmaii · Oct 7, 2022 · b8594fd · b8594fd
1 parent 6ce58a6
commit b8594fd
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -206,16 +206,35 @@ private static final class ResourceCollectorImpl implements ResourceCollector {
         private final ResourcePattern[] includePatterns;
         private final ResourcePattern[] excludePatterns;
         private final Set<String> includedResourcesModules;
+        private static final int WATCHDOG_RESET_AFTER_EVERY_N_RESOURCES = 1000;
+        private static final int WATCHDOG_WARNING_AFTER_EVERY_N_MILLISECONDS = 20_000;
+        private final Runnable heartbeatCallback;
+        private long registerResourceProgressTimerValue;
+        private static int reachedResourceEntries = 0;
 
-        private ResourceCollectorImpl(DebugContext debugContext, ResourcePattern[] includePatterns, ResourcePattern[] excludePatterns, Set<String> includedResourcesModules) {
+
+        private ResourceCollectorImpl(DebugContext debugContext, ResourcePattern[] includePatterns, ResourcePattern[] excludePatterns, Set<String> includedResourcesModules, Runnable heartbeatCallback) {
             this.debugContext = debugContext;
             this.includePatterns = includePatterns;
             this.excludePatterns = excludePatterns;
             this.includedResourcesModules = includedResourcesModules;
+            this.heartbeatCallback = heartbeatCallback;
+            this.registerResourceProgressTimerValue = System.currentTimeMillis();
         }
 
         @Override
         public boolean isIncluded(String moduleName, String resourceName) {
+            reachedResourceEntries++;
+            if (reachedResourceEntries % WATCHDOG_RESET_AFTER_EVERY_N_RESOURCES == 0) {
+                this.heartbeatCallback.run();
+            }
+
+            long now = System.currentTimeMillis();
+            if (now > this.registerResourceProgressTimerValue + WATCHDOG_WARNING_AFTER_EVERY_N_MILLISECONDS) {
+                System.out.println("Watchdog is scanning resources and reached " + reachedResourceEntries + " scanned entries. To speed up this process, please reduce number of resource files.");
+                this.registerResourceProgressTimerValue = now;
+            }
+
             String relativePathWithTrailingSlash = resourceName + RESOURCES_INTERNAL_PATH_SEPARATOR;
 
             for (ResourcePattern rp : excludePatterns) {
@@ -267,10 +286,11 @@ public void duringAnalysis(DuringAnalysisAccess access) {
 
         access.requireAnalysisIteration();
 
+        DuringAnalysisAccessImpl duringAnalysisAccess = ((DuringAnalysisAccessImpl) access);
         ResourcePattern[] includePatterns = compilePatterns(resourcePatternWorkSet);
         ResourcePattern[] excludePatterns = compilePatterns(excludedResourcePatterns);
-        DebugContext debugContext = ((DuringAnalysisAccessImpl) access).getDebugContext();
-        ResourceCollectorImpl collector = new ResourceCollectorImpl(debugContext, includePatterns, excludePatterns, includedResourcesModules);
+        DebugContext debugContext = duringAnalysisAccess.getDebugContext();
+        ResourceCollectorImpl collector = new ResourceCollectorImpl(debugContext, includePatterns, excludePatterns, includedResourcesModules, duringAnalysisAccess.bb.getHeartbeatCallback());
         ImageSingletons.lookup(ClassLoaderSupport.class).collectResources(collector);
         resourcePatternWorkSet.clear();
     }