jdk-sandbox: comparison src/java.net.http/share/classes/jdk/internal/net/http/hpack/SimpleHeaderTable.java

equal deleted inserted replaced

-:8e1ed2a15845
+:4690a2871b44
 import jdk.internal.net.http.hpack.HPACK.Logger;
 import java.util.NoSuchElementException;
+import static jdk.internal.net.http.common.Utils.pow2Size;
 import static jdk.internal.net.http.hpack.HPACK.Logger.Level.EXTRA;
 import static jdk.internal.net.http.hpack.HPACK.Logger.Level.NORMAL;
 import static java.lang.String.format;
 /*
 int tail, head, size, capacity;
 Object[] elements;
 CircularBuffer(int capacity) {
-this.capacity = capacity;
+this.capacity = pow2Size(capacity);
-elements = new Object[capacity];
+elements = new Object[this.capacity];
 }
 void add(E elem) {
 if (size == capacity) {
 throw new IllegalStateException(
 format("No room for '%s': capacity=%s", elem, capacity));
 }
 elements[head] = elem;
-head = (head + 1) % capacity;
+head = (head + 1) & (capacity - 1);
 size++;
 }
 @SuppressWarnings("unchecked")
 E remove() {
 if (size == 0) {
 throw new NoSuchElementException("Empty");
 }
 E elem = (E) elements[tail];
 elements[tail] = null;
-tail = (tail + 1) % capacity;
+tail = (tail + 1) & (capacity - 1);
 size--;
 return elem;
 }
 @SuppressWarnings("unchecked")
 if (index < 0 || index >= size) {
 throw new IndexOutOfBoundsException(
 format("0 <= index <= capacity: index=%s, capacity=%s",
 index, capacity));
 }
-int idx = (tail + (size - index - 1)) % capacity;
+int idx = (tail + (size - index - 1)) & (capacity - 1);
 return (E) elements[idx];
 }
 public void resize(int newCapacity) {
 if (newCapacity < size) {
 throw new IllegalStateException(
 format("newCapacity >= size: newCapacity=%s, size=%s",
 newCapacity, size));
 }
-Object[] newElements = new Object[newCapacity];
+int capacity = pow2Size(newCapacity);
+Object[] newElements = new Object[capacity];
 if (tail < head || size == 0) {
 System.arraycopy(elements, tail, newElements, 0, size);
 } else {
 System.arraycopy(elements, tail, newElements, 0, elements.length - tail);
 }
 elements = newElements;
 tail = 0;
 head = size;
-this.capacity = newCapacity;
+this.capacity = capacity;
 }
 }
 }

changeset 49944	4690a2871b44
parent 49765	ee6f7a61f3a5
child 50681	4254bed3c09d
child 56507	2294c51eae30