Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8253179: Replace LinkedList Impl in net.http.Http2Connection #431

Closed
wants to merge 2 commits into from
Closed

8253179: Replace LinkedList Impl in net.http.Http2Connection #431

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ecb85e
8253179: Replace LinkedList Impl in net.http.Http2Connection
c-cleary Sep 30, 2020
fc3f574
8253179: Removed ArrayList copy of streams
c-cleary Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
View file
Open in desktop
Expand Up @@ -33,14 +33,14 @@
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.ArrayList;
import java.util.Objects;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Flow;
Expand Down Expand Up @@ -248,7 +248,7 @@ void markPrefaceSent() {
//-------------------------------------
final HttpConnection connection;
private final Http2ClientImpl client2;
private final Map<Integer,Stream<?>> streams = new ConcurrentHashMap<>();
private final ConcurrentMap<Integer,Stream<?>> streams = new ConcurrentHashMap<>();
private int nextstreamid;
private int nextPushStream = 2;
// actual stream ids are not allocated until the Headers frame is ready
Expand Down Expand Up @@ -700,8 +700,7 @@ void shutdown(Throwable t) {
Throwable initialCause = this.cause;
if (initialCause == null) this.cause = t;
client2.deleteConnection(this);
List<Stream<?>> c = new LinkedList<>(streams.values());
for (Stream<?> s : c) {
for (Stream<?> s : streams.values()) {
try {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To address some of the feedback given, the streams are now directly addressed instead of making a copy. ConcurrentMap has also been used to initialise streams instead of Map. Seeking feedback/opinions on this if possible

s.connectionClosing(t);
} catch (Throwable e) {
Expand Down