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

equal deleted inserted replaced

-:c8fe5ffdfe98
+:4c502e3991bf
 // to be sent. The following two fields are updated as soon as a stream
 // is created and assigned to a connection. They are checked before
 // assigning a stream to a connection.
 private int lastReservedClientStreamid = 1;
 private int lastReservedServerStreamid = 0;
+private int numReservedClientStreams = 0; // count of current streams
+private int numReservedServerStreams = 0; // count of current streams
 private final Encoder hpackOut;
 private final Decoder hpackIn;
 final SettingsFrame clientSettings;
 private volatile SettingsFrame serverSettings;
 private final String key; // for HttpClientImpl.connections map
 client2.getConnectionWindowSize(clientSettings));
 }
 /**
 * Case 1) Create from upgraded HTTP/1.1 connection.
-* Is ready to use. Can be SSL. exchange is the Exchange
+* Is ready to use. Can't be SSL. exchange is the Exchange
 * that initiated the connection, whose response will be delivered
 * on a Stream.
 */
 private Http2Connection(HttpConnection connection,
 Http2ClientImpl client2,
 {
 this(connection,
 client2,
 3, // stream 1 is registered during the upgrade
 keyFor(connection));
+reserveStream(true);
 Log.logTrace("Connection send window size {0} ", windowController.connectionWindowSize());
 Stream<?> initialStream = createStream(exchange);
 initialStream.registerStream(1);
 windowController.registerStream(1, getInitialSendWindowSize());
 }
 // call these before assigning a request/stream to a connection
 // if false returned then a new Http2Connection is required
 // if true, the the stream may be assigned to this connection
-synchronized boolean reserveStream(boolean clientInitiated) {
+// for server push, if false returned, then the stream should be cancelled
+synchronized boolean reserveStream(boolean clientInitiated) throws IOException {
 if (finalStream) {
 return false;
 }
 if (clientInitiated && (lastReservedClientStreamid + 2) >= MAX_CLIENT_STREAM_ID) {
 setFinalStream();
 }
 if (clientInitiated)
 lastReservedClientStreamid+=2;
 else
 lastReservedServerStreamid+=2;
+assert numReservedClientStreams >= 0;
+assert numReservedServerStreams >= 0;
+if (clientInitiated && numReservedClientStreams >= getMaxConcurrentClientStreams()) {
+throw new IOException("too many concurrent streams");
+} else if (clientInitiated) {
+numReservedClientStreams++;
+}
+if (!clientInitiated && numReservedServerStreams >= getMaxConcurrentServerStreams()) {
+return false;
+} else if (!clientInitiated) {
+numReservedServerStreams++;
+}
 return true;
 }
 /**
 * Throws an IOException if h2 was not negotiated
 }
 }
 final int getInitialSendWindowSize() {
 return serverSettings.getParameter(INITIAL_WINDOW_SIZE);
+}
+final int getMaxConcurrentClientStreams() {
+return serverSettings.getParameter(MAX_CONCURRENT_STREAMS);
+}
+final int getMaxConcurrentServerStreams() {
+return clientSettings.getParameter(MAX_CONCURRENT_STREAMS);
 }
 void close() {
 Log.logTrace("Closing HTTP/2 connection: to {0}", connection.address());
 GoAwayFrame f = new GoAwayFrame(0,
 }
 }
 void closeStream(int streamid) {
 if (debug.on()) debug.log("Closed stream %d", streamid);
+boolean isClient = (streamid % 2) == 1;
 Stream<?> s = streams.remove(streamid);
 if (s != null) {
+synchronized (this) {
+if (isClient)
+numReservedClientStreams--;
+else
+numReservedServerStreams--;
+}
+assert numReservedClientStreams >= 0;
+assert numReservedServerStreams >= 0;
 // decrement the reference count on the HttpClientImpl
 // to allow the SelectorManager thread to exit if no
 // other operation is pending and the facade is no
 // longer referenced.
 client().streamUnreference();
 private final ConcurrentLinkedQueue<ByteBuffer> queue
 = new ConcurrentLinkedQueue<>();
 private final SequentialScheduler scheduler =
 SequentialScheduler.synchronizedScheduler(this::processQueue);
 private final HttpClientImpl client;
 Http2TubeSubscriber(HttpClientImpl client) {
 this.client = Objects.requireNonNull(client);
 }
 final void processQueue() {

branch	http-client-branch
changeset 56598	4c502e3991bf
parent 56531	15ff86a732ea
child 56616	5d2446adafaf