Skip to content

Commit 31aa8cd

Browse files
s1ckknutwalker
andcommitted
Expand intel Mac workaround to Mac generally
Co-Authored-By: Paul Horn <[email protected]>
1 parent 2c8b104 commit 31aa8cd

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

memory-usage/src/main/java/org/neo4j/gds/mem/MemoryUsage.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ private static final class VmInfoHolder {
372372
*/
373373
@SuppressForbidden(reason = "we want to use system.out here")
374374
private static boolean isVmInfoAvailable() {
375-
intelMacWorkaround();
375+
macWorkaround();
376376

377377
var sysOut = System.out;
378378
try {
@@ -389,19 +389,16 @@ private static boolean isVmInfoAvailable() {
389389
}
390390

391391
/**
392-
* JOL currently gets stuck on Azul Zulu 17.44.53-ca-jdk17.0.8.1 on Intel Macs.
392+
* JOL currently kills the JVM on Mac OS X when trying to attach to the Hotspot SA.
393+
* This happens with several JVMs (Java.net, Azul) and on both platforms (x86, ARM).
393394
* <p>
394395
* We can work around this by skipping the Hotspot SA attach.
395396
* See <a href="https://bugs.openjdk.org/browse/CODETOOLS-7903447">OpenJDK issue</a>
396397
* </p>
397398
*/
398399
@Deprecated(forRemoval = true)
399-
private static void intelMacWorkaround() {
400-
var isAzul = System.getProperty("java.vendor").contains("Azul Systems");
401-
var isIntel = System.getProperty("os.arch").contains("x86_64");
402-
var isMac = System.getProperty("os.name").contains("Mac");
403-
404-
if (isAzul && isIntel && isMac) {
400+
private static void macWorkaround() {
401+
if (System.getProperty("os.name").contains("Mac")) {
405402
System.setProperty("jol.skipHotspotSAAttach", "true");
406403
}
407404
}

0 commit comments

Comments
 (0)