Record activity when generating debuginfo.

oracle · Aug 31, 2023 · f755789 · f755789
1 parent dfa3469
commit f755789
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/...tratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java b/...tratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java
@@ -299,6 +299,7 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
             Path filePath = debugTypeInfo.filePath();
             addTypeEntry(idType, typeName, fileName, filePath, byteSize, typeKind);
         }));
+        debugInfoProvider.recordActivity();
 
         /* Now we can cross reference static and instance field details. */
         debugInfoProvider.typeInfoProvider().forEach(debugTypeInfo -> debugTypeInfo.debugContext((debugContext) -> {
@@ -310,6 +311,7 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
             TypeEntry typeEntry = (idType != null ? lookupTypeEntry(idType) : lookupHeaderType());
             typeEntry.addDebugInfo(this, debugTypeInfo, debugContext);
         }));
+        debugInfoProvider.recordActivity();
 
         debugInfoProvider.codeInfoProvider().forEach(debugCodeInfo -> debugCodeInfo.debugContext((debugContext) -> {
             /*
@@ -336,6 +338,7 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
             EconomicMap<DebugLocationInfo, SubRange> subRangeIndex = EconomicMap.create();
             debugCodeInfo.locationInfoProvider().forEach(debugLocationInfo -> addSubrange(debugLocationInfo, primaryRange, classEntry, subRangeIndex, debugContext));
         }));
+        debugInfoProvider.recordActivity();
 
         debugInfoProvider.dataInfoProvider().forEach(debugDataInfo -> debugDataInfo.debugContext((debugContext) -> {
             if (debugContext.isLogEnabled(DebugContext.INFO_LEVEL)) {
@@ -348,10 +351,13 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
                 debugContext.log(DebugContext.INFO_LEVEL, "Data: address 0x%x size 0x%x type %s partition %s provenance %s ", address, size, typeName, partitionName, provenance);
             }
         }));
+        debugInfoProvider.recordActivity();
+
         // populate a file and dir list and associated index for each class entry
         getInstanceClasses().forEach(classEntry -> {
             collectFilesAndDirs(classEntry);
         });
+        debugInfoProvider.recordActivity();
     }
 
     private TypeEntry createTypeEntry(String typeName, String fileName, Path filePath, int size, DebugTypeKind typeKind) {

diff --git a/...tevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java b/...tevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java
@@ -444,4 +444,6 @@ enum Type {
     Stream<DebugDataInfo> dataInfoProvider();
 
     Path getCachePath();
+
+    void recordActivity();
 }
diff --git a/...rc/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java b/...rc/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java
@@ -107,7 +107,8 @@ public void beforeImageWrite(BeforeImageWriteAccess access) {
             var accessImpl = (FeatureImpl.BeforeImageWriteAccessImpl) access;
             var image = accessImpl.getImage();
             var debugContext = new DebugContext.Builder(HostedOptionValues.singleton(), new GraalDebugHandlersFactory(GraalAccess.getOriginalSnippetReflection())).build();
-            DebugInfoProvider provider = new NativeImageDebugInfoProvider(debugContext, image.getCodeCache(), image.getHeap(), image.getNativeLibs(), accessImpl.getHostedMetaAccess());
+            DebugInfoProvider provider = new NativeImageDebugInfoProvider(debugContext, image.getCodeCache(), image.getHeap(), image.getNativeLibs(), accessImpl.getHostedMetaAccess(),
+                            accessImpl.getImageClassLoader().watchdog::recordActivity);
             var objectFile = image.getObjectFile();
             objectFile.installDebugInfo(provider);
 

diff --git a/...c/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java b/...c/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
@@ -119,8 +119,9 @@
 class NativeImageDebugInfoProvider extends NativeImageDebugInfoProviderBase implements DebugInfoProvider {
     private final DebugContext debugContext;
     private final Set<HostedMethod> allOverrides;
+    private final Runnable heartbeatCallback;
 
-    NativeImageDebugInfoProvider(DebugContext debugContext, NativeImageCodeCache codeCache, NativeImageHeap heap, NativeLibraries nativeLibs, HostedMetaAccess metaAccess) {
+    NativeImageDebugInfoProvider(DebugContext debugContext, NativeImageCodeCache codeCache, NativeImageHeap heap, NativeLibraries nativeLibs, HostedMetaAccess metaAccess, Runnable heartbeatCallback) {
         super(codeCache, heap, nativeLibs, metaAccess);
         this.debugContext = debugContext;
         /* Calculate the set of all HostedMethods that are overrides. */
@@ -129,6 +130,7 @@ class NativeImageDebugInfoProvider extends NativeImageDebugInfoProviderBase impl
                         .flatMap(m -> Arrays.stream(m.getImplementations())
                                         .filter(Predicate.not(m::equals)))
                         .collect(Collectors.toSet());
+        this.heartbeatCallback = heartbeatCallback;
     }
 
     @Override
@@ -2704,4 +2706,9 @@ private boolean acceptObjectInfo(ObjectInfo objectInfo) {
     private DebugDataInfo createDebugDataInfo(ObjectInfo objectInfo) {
         return new NativeImageDebugDataInfo(objectInfo);
     }
+
+    @Override
+    public void recordActivity() {
+        heartbeatCallback.run();
+    }
 }