Skip to content

Commit 55a7eb6

Browse files
committed
Prevent MemoryUsage.sizeOf from failing if JOL fails
1 parent 6cb8870 commit 55a7eb6

File tree

2 files changed

+50
-1
lines changed

2 files changed

+50
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,12 @@ public static long sizeOf(Object thing) {
298298
if (!VmInfoHolder.VM_INFO_AVAILABLE) {
299299
return -1L;
300300
}
301-
return new GraphWalker().walk(thing).totalSize();
301+
302+
try {
303+
return new GraphWalker().walk(thing).totalSize();
304+
} catch (RuntimeException e) {
305+
return -1;
306+
}
302307
}
303308

304309
/**
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright (c) "Neo4j"
3+
* Neo4j Sweden AB [http://neo4j.com]
4+
*
5+
* This file is part of Neo4j.
6+
*
7+
* Neo4j is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License as published by
9+
* the Free Software Foundation, either version 3 of the License, or
10+
* (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Public License
18+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
*/
20+
package org.neo4j.gds.mem;
21+
22+
import org.junit.jupiter.api.Test;
23+
24+
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
25+
26+
class MemoryUsageTest {
27+
28+
@Test
29+
void ofShouldNotFailIfJOLFails() {
30+
assertThatCode(() -> MemoryUsage.sizeOf(new JOLMightFail())).doesNotThrowAnyException();
31+
}
32+
33+
// The nested recursive ThreadLocal causes JOL to be unable to access some attributes of the class on the ZULU JVM
34+
private static final class JOLMightFail {
35+
private final ThreadLocal<JOLMightFail> threadLocal;
36+
37+
private JOLMightFail() {threadLocal = ThreadLocal.withInitial(() -> this);}
38+
39+
ThreadLocal<JOLMightFail> getThreadLocal() {
40+
return threadLocal;
41+
}
42+
}
43+
44+
}

0 commit comments

Comments
 (0)