Skip to content

Do not rely on timeout when testing smap entry cache #9265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbachorik merged 2 commits into from
Jul 28, 2025
Merged

Do not rely on timeout when testing smap entry cache #9265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d2db6b
Do not rely on timeout when testing smap entry cache
jbachorik Jul 28, 2025
a88d630
Spotless!
jbachorik Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ static class AnnotatedRegion {
this.smapsPath = smapsPath;
}

// @VisibleForTesting
void invalidate() {
UPDATER.getAndSet(this, System.nanoTime() - (2 * ttl));
}

@SuppressWarnings("unchecked")
public List<SmapEntryEvent> getEvents() {
long prevTimestamp = lastTimestamp;
Expand Down Expand Up @@ -296,9 +301,9 @@ private static Map<Long, String> getAnnotatedRegions() {
return Collections.emptyMap();
}

private static void collectEvents(List<SmapEntryEvent> events) {
private void collectEvents(List<SmapEntryEvent> events) {
try (BufferedReader br =
new BufferedReader(new InputStreamReader(Files.newInputStream(SMAPS_PATH)), 64 * 1024)) {
new BufferedReader(new InputStreamReader(Files.newInputStream(smapsPath)), 64 * 1024)) {

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD Jul 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

readEvents(br, events);
Map<Long, String> regions = getAnnotatedRegions();
for (SmapEntryEvent e : events) {
Expand Down
8 changes: 3 additions & 5 deletions ...jdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@ void getEvents() throws Exception {
assumeTrue(OperatingSystem.isLinux());
// We need at least Java 22 for the annotated regions
assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(22));
SmapEntryCache smapEntryCache = new SmapEntryCache(Duration.ofMillis(100));
SmapEntryCache smapEntryCache =
new SmapEntryCache(Duration.ofHours(1)); // set up a really long expiration duration
List<SmapEntryEvent> events1 = smapEntryCache.getEvents();
List<SmapEntryEvent> events2 = smapEntryCache.getEvents();
// the cache is using double buffered event list so we can use identity comparison
assertSame(events1, events2);

long ts = System.nanoTime();
while (System.nanoTime() - ts < 150_000_000L) { // make sure the cache is expired
Thread.sleep(200);
}
smapEntryCache.invalidate(); // pretend expiring the cache
events1 = smapEntryCache.getEvents();
assertNotSame(events1, events2);
}
Expand Down