jdk-sandbox: comparison src/java.net.http/share/classes/jdk/internal/net/http/common/SSLFlowDelegate.java

equal deleted inserted replaced

-:64597a6fd186
+:6b6bf0de534b
 readBuf = newb;
 }
 @Override
 protected long upstreamWindowUpdate(long currentWindow, long downstreamQsize) {
-if (readBuf.remaining() > TARGET_BUFSIZE) {
+if (needsMoreData()) {
-if (debugr.on())
+// run the scheduler to see if more data should be requested
-debugr.log("readBuf has more than TARGET_BUFSIZE: %d",
+if (debugr.on()) {
-readBuf.remaining());
+int remaining = readBuf.remaining();
-return 0;
+if (remaining > TARGET_BUFSIZE) {
-} else {
+// just some logging to check how much we have in the read buffer
-return super.upstreamWindowUpdate(currentWindow, downstreamQsize);
+debugr.log("readBuf has more than TARGET_BUFSIZE: %d",
-}
+remaining);
+}
+}
+scheduler.runOrSchedule();
+}
+return 0; // we will request more from the scheduler loop (processData).
 }
 // readBuf is kept ready for reading outside of this method
 private void addToReadBuf(List<ByteBuffer> buffers, boolean complete) {
 assert Utils.remaining(buffers) > 0 || buffers.isEmpty();
 // minimum number of bytes required to call unwrap.
 // Usually this is 0, unless there was a buffer underflow.
 // In this case we need to wait for more bytes than what
 // we had before calling unwrap() again.
 volatile int minBytesRequired;
+// We might need to request more data if:
+//  - we have a subscription from upstream
+//  - and we don't have enough data to decrypt in the read buffer
+//  - *and* - either we're handshaking, and more data is required (NEED_UNWRAP),
+//          - or we have demand from downstream, but we have nothing decrypted
+//            to forward downstream.
+boolean needsMoreData() {
+if (upstreamSubscription != null && readBuf.remaining() <= minBytesRequired &&
+(engine.getHandshakeStatus() == HandshakeStatus.NEED_UNWRAP
+|| !downstreamSubscription.demand.isFulfilled() && hasNoOutputData())) {
+return true;
+}
+return false;
+}
+// If the readBuf has not enough data, and we either need to
+// unwrap (handshaking) or we have demand from downstream,
+// then request more data
+void requestMoreDataIfNeeded() {
+if (needsMoreData()) {
+// request more will only request more if our
+// demand from upstream is fulfilled
+requestMore();
+}
+}
 // work function where it all happens
 final void processData() {
 try {
 if (debugr.on())
 if (complete && result.status() == Status.CLOSED) {
 if (debugr.on()) debugr.log("Closed: completing");
 outgoing(Utils.EMPTY_BB_LIST, true);
 // complete ALPN if not yet completed
 setALPN();
+requestMoreDataIfNeeded();
 return;
 }
 if (result.handshaking()) {
 handshaking = true;
 if (debugr.on()) debugr.log("handshaking");
 } catch (IOException ex) {
 errorCommon(ex);
 handleError(ex);
 return;
 }
-if (handshaking && !complete)
+if (handshaking && !complete) {
+requestMoreDataIfNeeded();
 return;
+}
 }
 if (!complete) {
 synchronized (readBufferLock) {
 complete = this.completing && !readBuf.hasRemaining();
 }
 // Complete the alpnCF, if not already complete, regardless of
 // whether or not the ALPN is available, there will be no more
 // activity.
 setALPN();
 outgoing(Utils.EMPTY_BB_LIST, true);
+} else {
+requestMoreDataIfNeeded();
 }
 } catch (Throwable ex) {
 errorCommon(ex);
 handleError(ex);
 }

changeset 58649	6b6bf0de534b
parent 53350	a47b8125b7cc