[GR-45097] Record queryCode compilation as DeadlockWatchdog activity.

PullRequest: graal/14129

Author: ntemmar

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

@@ -1709,7 +1709,7 @@ protected void processNativeLibraryImports(NativeLibraries nativeLibs, MetaAcces
         }
         nativeLibs.processCLibraryAnnotations(loader);
 
-        nativeLibs.finish();
+        nativeLibs.finish(loader);
         nativeLibs.reportErrors();
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessor.java

@@ -34,7 +34,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.oracle.svm.hosted.c.libc.HostedLibCBase;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
@@ -43,10 +42,12 @@
 import com.oracle.svm.core.util.InterruptImageBuilding;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.ImageClassLoader;
 import com.oracle.svm.hosted.c.codegen.CCompilerInvoker;
 import com.oracle.svm.hosted.c.codegen.QueryCodeWriter;
 import com.oracle.svm.hosted.c.info.InfoTreeBuilder;
 import com.oracle.svm.hosted.c.info.NativeCodeInfo;
+import com.oracle.svm.hosted.c.libc.HostedLibCBase;
 import com.oracle.svm.hosted.c.query.QueryResultParser;
 import com.oracle.svm.hosted.c.query.RawStructureLayoutPlanner;
 import com.oracle.svm.hosted.c.query.SizeAndSignednessVerifier;
@@ -83,7 +84,7 @@ public CAnnotationProcessor(NativeLibraries nativeLibs, NativeCodeContext codeCt
         }
     }
 
-    public NativeCodeInfo process(CAnnotationProcessorCache cache) {
+    public NativeCodeInfo process(CAnnotationProcessorCache cache, ImageClassLoader loader) {
         InfoTreeBuilder constructor = new InfoTreeBuilder(nativeLibs, codeCtx);
         codeInfo = constructor.construct();
         if (nativeLibs.getErrors().size() > 0) {
@@ -108,8 +109,8 @@ public NativeCodeInfo process(CAnnotationProcessorCache cache) {
                 // Only output query code and exit
                 return codeInfo;
             }
-
             Path binary = compileQueryCode(queryFile);
+            loader.watchdog.recordActivity();
             if (nativeLibs.getErrors().size() > 0) {
                 return codeInfo;
             }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java

@@ -550,13 +550,13 @@ private Class<? extends CContext.Directives> getDirectives(ResolvedJavaType type
         }
     }
 
-    public void finish() {
+    public void finish(ImageClassLoader loader) {
         libraryPaths.addAll(SubstrateOptions.CLibraryPath.getValue().values().stream().map(Path::toString).collect(Collectors.toList()));
         for (NativeCodeContext context : compilationUnitToContext.values()) {
             if (context.isInConfiguration()) {
                 libraries.addAll(context.getDirectives().getLibraries());
                 libraryPaths.addAll(context.getDirectives().getLibraryPaths());
-                new CAnnotationProcessor(this, context).process(cache);
+                new CAnnotationProcessor(this, context).process(cache, loader);
             }
         }
     }