src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java

*** 22,39 ****
--- 22,42 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package jdk.incubator.http.internal.hpack;
  
+ import jdk.incubator.http.internal.hpack.HPACK.Logger;
  import jdk.internal.vm.annotation.Stable;
  
  import java.util.HashMap;
  import java.util.LinkedHashMap;
  import java.util.Map;
  import java.util.NoSuchElementException;
  
  import static java.lang.String.format;
+ import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.EXTRA;
+ import static jdk.incubator.http.internal.hpack.HPACK.Logger.Level.NORMAL;
  
  //
  // Header Table combined from two tables: static and dynamic.
  //
  // There is a single address space for index values. Index-aware methods
*** 120,134 ****
                      .computeIfAbsent(f.name, k -> new LinkedHashMap<>());
              values.put(f.value, i);
          }
      }
  
      private final Table dynamicTable = new Table(0);
      private int maxSize;
      private int size;
  
!     public HeaderTable(int maxSize) {
          setMaxSize(maxSize);
      }
  
      //
      // The method returns:
--- 123,139 ----
                      .computeIfAbsent(f.name, k -> new LinkedHashMap<>());
              values.put(f.value, i);
          }
      }
  
+     private final Logger logger;
      private final Table dynamicTable = new Table(0);
      private int maxSize;
      private int size;
  
!     public HeaderTable(int maxSize, Logger logger) {
!         this.logger = logger;
          setMaxSize(maxSize);
      }
  
      //
      // The method returns:
*** 209,233 ****
          // the table, it must not be mutable (e.g. for the sake of hashing).
          put(new HeaderField(name.toString(), value.toString()));
      }
  
      private void put(HeaderField h) {
          int entrySize = sizeOf(h);
          while (entrySize > maxSize - size && size != 0) {
              evictEntry();
          }
          if (entrySize > maxSize - size) {
              return;
          }
          size += entrySize;
          dynamicTable.add(h);
      }
  
      void setMaxSize(int maxSize) {
          if (maxSize < 0) {
!             throw new IllegalArgumentException
!                     ("maxSize >= 0: maxSize=" + maxSize);
          }
          while (maxSize < size && size != 0) {
              evictEntry();
          }
          this.maxSize = maxSize;
--- 214,258 ----
          // the table, it must not be mutable (e.g. for the sake of hashing).
          put(new HeaderField(name.toString(), value.toString()));
      }
  
      private void put(HeaderField h) {
+         if (logger.isLoggable(NORMAL)) {
+             logger.log(NORMAL, () -> format("adding ('%s', '%s')",
+                                             h.name, h.value));
+         }
          int entrySize = sizeOf(h);
+         if (logger.isLoggable(EXTRA)) {
+             logger.log(EXTRA, () -> format("size of ('%s', '%s') is %s",
+                                            h.name, h.value, entrySize));
+         }
          while (entrySize > maxSize - size && size != 0) {
+             if (logger.isLoggable(EXTRA)) {
+                 logger.log(EXTRA, () -> format("insufficient space %s, must evict entry",
+                                                (maxSize - size)));
+             }
              evictEntry();
          }
          if (entrySize > maxSize - size) {
+             if (logger.isLoggable(EXTRA)) {
+                 logger.log(EXTRA, () -> format("not adding ('%s, '%s'), too big",
+                                                h.name, h.value));
+             }
              return;
          }
          size += entrySize;
          dynamicTable.add(h);
+         if (logger.isLoggable(EXTRA)) {
+             logger.log(EXTRA, () -> format("('%s, '%s') added", h.name, h.value));
+             logger.log(EXTRA, this::toString);
+         }
      }
  
      void setMaxSize(int maxSize) {
          if (maxSize < 0) {
!             throw new IllegalArgumentException(
!                     "maxSize >= 0: maxSize=" + maxSize);
          }
          while (maxSize < size && size != 0) {
              evictEntry();
          }
          this.maxSize = maxSize;
*** 235,260 ****
          this.dynamicTable.setCapacity(upperBound);
      }
  
      HeaderField evictEntry() {
          HeaderField f = dynamicTable.remove();
!         size -= sizeOf(f);
          return f;
      }
  
      @Override
      public String toString() {
          double used = maxSize == 0 ? 0 : 100 * (((double) size) / maxSize);
!         return format("entries: %d; used %s/%s (%.1f%%)", dynamicTable.size(),
!                 size, maxSize, used);
      }
  
!     int checkIndex(int index) {
!         if (index < 1 || index > STATIC_TABLE_LENGTH + dynamicTable.size()) {
!             throw new IllegalArgumentException(
                      format("1 <= index <= length(): index=%s, length()=%s",
!                             index, length()));
          }
          return index;
      }
  
      int sizeOf(HeaderField f) {
--- 260,292 ----
          this.dynamicTable.setCapacity(upperBound);
      }
  
      HeaderField evictEntry() {
          HeaderField f = dynamicTable.remove();
!         int s = sizeOf(f);
!         this.size -= s;
!         if (logger.isLoggable(EXTRA)) {
!             logger.log(EXTRA, () -> format("evicted entry ('%s', '%s') of size %s",
!                                            f.name, f.value, s));
!             logger.log(EXTRA, this::toString);
!         }
          return f;
      }
  
      @Override
      public String toString() {
          double used = maxSize == 0 ? 0 : 100 * (((double) size) / maxSize);
!         return format("dynamic length: %d, full length: %s, used space: %s/%s (%.1f%%)",
!                       dynamicTable.size(), length(), size, maxSize, used);
      }
  
!     private int checkIndex(int index) {
!         int len = length();
!         if (index < 1 || index > len) {
!             throw new IndexOutOfBoundsException(
                      format("1 <= index <= length(): index=%s, length()=%s",
!                            index, len));
          }
          return index;
      }
  
      int sizeOf(HeaderField f) {