GH-545 allow to share heap cache

oracle · Jan 4, 2024 · 0e4f00c · 0e4f00c
1 parent 4e38874
commit 0e4f00c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...s.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/CacheDirectory.java b/...s.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/CacheDirectory.java
@@ -160,6 +160,17 @@ private File lookupFile(String fileName, boolean checkParent) throws FileNotFoun
         if (isFileR(f)) {
             return f;
         }
+        if (!fileName.contains(File.separator)) {
+            // OS mismatch, try opposite separator
+            char sep = File.separatorChar == '/' ? '\\' : '/';      // NOI18N
+            int lastSep = fileName.lastIndexOf(sep);
+            if (lastSep != -1) {
+                f = new File(dir, fileName.substring(lastSep+1));
+                if (isFileR(f)) {
+                    return f;
+                }
+            }
+        }
         throw new FileNotFoundException(fileName);
     }
 

diff --git a/...m/libs.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/HprofHeap.java b/...m/libs.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/HprofHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -386,7 +386,7 @@ void writeToStream(DataOutputStream out) throws IOException {
         }
         String os = dis.readUTF();
         if (!os.equals(System.getProperty(OS_PROP))) {
-            throw new IOException("HPROF OS mismatch. Cached "+os+" current OS "+System.getProperty(OS_PROP));
+            System.err.println("Warning: HPROF OS mismatch. Cached "+os+" current OS "+System.getProperty(OS_PROP));
         }
         nearestGCRoot = new NearestGCRoot(this, dis);
         allInstanceDumpBounds = new TagBounds(dis);