#9900: only take begin nanotime once per stream

Signed-off-by: Ludovic Orban <[email protected]>
jetty · Nov 23, 2023 · 0ebea03 · 0ebea03
1 parent 03f2e76
commit 0ebea03
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/...e/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java b/...e/jetty-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/Parser.java
@@ -54,7 +54,8 @@ public class Parser
     private int maxSettingsKeys = SettingsFrame.DEFAULT_MAX_KEYS;
     private boolean continuation;
     private State state = State.HEADER;
-    protected long beginNanoTime = Long.MIN_VALUE;
+    private long beginNanoTime = Long.MIN_VALUE;
+    private boolean nanoTimeRead = true;
 
     public Parser(ByteBufferPool bufferPool, int maxHeaderSize)
     {
@@ -65,7 +66,11 @@ public Parser(ByteBufferPool bufferPool, int maxHeaderSize, RateControl rateCont
     {
         this.bufferPool = bufferPool;
         this.headerParser = new HeaderParser(rateControl == null ? RateControl.NO_RATE_CONTROL : rateControl);
-        this.hpackDecoder = new HpackDecoder(maxHeaderSize, () -> beginNanoTime);
+        this.hpackDecoder = new HpackDecoder(maxHeaderSize, () ->
+        {
+            nanoTimeRead = true;
+            return beginNanoTime;
+        });
         this.bodyParsers = new BodyParser[FrameType.values().length];
     }
 
@@ -104,6 +109,18 @@ private void reset()
         headerParser.reset();
         state = State.HEADER;
         beginNanoTime = Long.MIN_VALUE;
+        nanoTimeRead = true;
+    }
+
+    protected void takeNanoTime()
+    {
+        if (nanoTimeRead)
+        {
+            beginNanoTime = NanoTime.now(); // TODO #9900 check beginNanoTime's accuracy
+            if (beginNanoTime == Long.MIN_VALUE)
+                beginNanoTime++;
+            nanoTimeRead = false;
+        }
     }
 
     /**
@@ -121,13 +138,13 @@ public void parse(ByteBuffer buffer)
     {
         try
         {
+            takeNanoTime();
             while (true)
             {
                 switch (state)
                 {
                     case HEADER:
                     {
-                        beginNanoTime = NanoTime.now(); // TODO #9900 check beginNanoTime's accuracy
                         if (!parseHeader(buffer))
                             return;
                         break;

diff --git a/...y-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java b/...y-http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/parser/ServerParser.java
@@ -21,7 +21,6 @@
 import org.eclipse.jetty.http2.frames.FrameType;
 import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.util.BufferUtil;
-import org.eclipse.jetty.util.NanoTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,14 +86,13 @@ public void parse(ByteBuffer buffer)
         {
             if (LOG.isDebugEnabled())
                 LOG.debug("Parsing {}", buffer);
-
+            takeNanoTime();
             while (true)
             {
                 switch (state)
                 {
                     case PREFACE:
                     {
-                        beginNanoTime = NanoTime.now(); // TODO #9900 check beginNanoTime's accuracy
                         if (!prefaceParser.parse(buffer))
                             return;
                         if (notifyPreface)