From 0e6b0cbaaa0d5272f60ee4fe09cf5e247e68c2a8 Mon Sep 17 00:00:00 2001 From: Erik Gahlin Date: Thu, 27 Jun 2024 15:38:06 +0000 Subject: [PATCH] 8334886: jdk/jfr/api/recording/time/TestTimeMultiple.java failed with RuntimeException: getStopTime() > afterStop Reviewed-by: mgronlun --- src/hotspot/share/jfr/recorder/repository/jfrChunk.cpp | 2 -- src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java | 1 - 2 files changed, 3 deletions(-) diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunk.cpp b/src/hotspot/share/jfr/recorder/repository/jfrChunk.cpp index b88ba06bdf7..a35b046e56c 100644 --- a/src/hotspot/share/jfr/recorder/repository/jfrChunk.cpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrChunk.cpp @@ -47,8 +47,6 @@ jlong JfrChunk::nanos_now() { const jlong now = seconds * 1000000000 + nanos; if (now > last) { last = now; - } else { - ++last; } return last; } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java index 345d2fdcc8d..114052ecea2 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java @@ -103,7 +103,6 @@ public final class JVMSupport { static long getChunkStartNanos() { long nanos = JVM.getChunkStartNanos(); - // JVM::getChunkStartNanos() may return a bumped timestamp, +1 ns or +2 ns. // Spin here to give Instant.now() a chance to catch up. awaitUniqueTimestamp(); return nanos;