infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-12 19:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

8357539: TimeSource.now() is not monotonic

Browse Source 
Reviewed-by: dfuchs, jpai
This commit is contained in:
Daniel Jeliński 2025-05-23 11:55:21 +00:00
parent 68ee06f0c9
commit 488e4ea5c6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java.net.http/share/classes/jdk/internal/net/http/common/TimeSource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2025, 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
@ -69,6 +69,8 @@ public final class TimeSource implements TimeLine {
}
Deadline instant(long nanos, long delay) {
assert firstNanos + delay == nanos :
"%d + %d != %d".formatted(firstNanos, delay, nanos);
Instant now = first.plusNanos(delay);
if (!isInWindow(delay)) {
// Shifts the time reference (firstNanos) to
@ -85,18 +87,19 @@ public final class TimeSource implements TimeLine {
}
boolean isInWindow(long delay) {
return delay >= 0 && delay <= TIME_WINDOW;
return delay >= -TIME_WINDOW && delay <= TIME_WINDOW;
}
}
@Override
public Deadline instant() {
long nanos = System.nanoTime();
long delay = localSource.delay(nanos);
// use localSource if possible to avoid a volatile read
if (localSource.isInWindow(delay)) {
return localSource.instant(nanos, delay);
NanoSource source = localSource;
long nanos = System.nanoTime();
long delay = source.delay(nanos);
if (source.isInWindow(delay)) {
return source.instant(nanos, delay);
} else {
// will cause the time reference to shift forward,
// at the cost of a volatile write + a volatile read