record watchdog activity inside NativeImageCodeCache.layoutConstants

wirthi · wirthi · commit 291c40e760c4 · 2025-05-07T13:35:38.000+02:00
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
@@ -207,6 +207,7 @@ public CompilationResult compilationResultFor(HostedMethod method) {
     public abstract void layoutMethods(DebugContext debug, BigBang bb);
 
     public void layoutConstants() {
+        DeadlockWatchdog watchdog = ImageSingletons.lookup(DeadlockWatchdog.class);
         for (Pair<HostedMethod, CompilationResult> pair : getOrderedCompilations()) {
             CompilationResult compilation = pair.getRight();
             for (DataSection.Data data : compilation.getDataSection()) {
@@ -224,6 +225,7 @@ public void layoutConstants() {
                     constantReasons.put(constant, compilation.getName());
                 }
             }
+            watchdog.recordActivity();
         }
         dataSection.close(HostedOptionValues.singleton(), 1);
     }

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,7 @@ public CompilationResult compilationResultFor(HostedMethod method) {`
`207`	`207`	`public abstract void layoutMethods(DebugContext debug, BigBang bb);`
`208`	`208`
`209`	`209`	`public void layoutConstants() {`
	`210`	`+ DeadlockWatchdog watchdog = ImageSingletons.lookup(DeadlockWatchdog.class);`
`210`	`211`	`for (Pair<HostedMethod, CompilationResult> pair : getOrderedCompilations()) {`
`211`	`212`	`CompilationResult compilation = pair.getRight();`
`212`	`213`	`for (DataSection.Data data : compilation.getDataSection()) {`
`@@ -224,6 +225,7 @@ public void layoutConstants() {`
`224`	`225`	`constantReasons.put(constant, compilation.getName());`
`225`	`226`	`}`
`226`	`227`	`}`
	`228`	`+ watchdog.recordActivity();`
`227`	`229`	`}`
`228`	`230`	`dataSection.close(HostedOptionValues.singleton(), 1);`
`229`	`231`	`}`