Add QuicStreamsBlockedFrame and QuicMaxStreamsFrame classes
There are two main parts to this work
1) connecting up the new frames, replacing the old ones, to move data around the
system. This also entails a lot of editorial changes (just changing names, comments,
and so on, without notable logic chanages -- eg, "OnMaxStreamIdFrame" becomes
"OnMaxStreamsFrame".
2) the second, and more complex, task is revising the stream id manager to work entirely
with stream counts rather than stream-ids. For example, the logic to check whether a
new stream can be created checks if the current-stream-count is less than the limit
or not, rather than if the next stream id to hand out is above the limit or not.
For all intents and purposes, this completely rewrote the stream ID manager.
Another big change resulting from keeping track solely of stream counts is that the
stream ID manager doesn't care whether it is doing unidirectional or bidirectional
streams, nor does it care whether stream ids are client- or server- initiated.
gfe-relnote: N/A, all changes are for V99/IETF QUIC code only.
LOG_STORAGE_INCREASE(GB/week): 0
TMPLOG_STORAGE_INCREASE(GB): 0
This change neither adds nor deletes data stored. It adds two new codepoints to the QUIC FrameType enum. These new enums reflect two new frames defined in IETF QUIC, which replace two now-deprecated frames (and their associated type codepoints). This is a name change/type codepoint extension; data is neither added nor deleted.
PiperOrigin-RevId: 244661277
Change-Id: I07cdb79db6bd15e1d5ece97b3aa2d67e94ccf00b
diff --git a/quic/test_tools/quic_framer_peer.cc b/quic/test_tools/quic_framer_peer.cc
index 13b3150..23486ea 100644
--- a/quic/test_tools/quic_framer_peer.cc
+++ b/quic/test_tools/quic_framer_peer.cc
@@ -199,7 +199,7 @@
// static
bool QuicFramerPeer::AppendMaxStreamsFrame(QuicFramer* framer,
- const QuicMaxStreamIdFrame& frame,
+ const QuicMaxStreamsFrame& frame,
QuicDataWriter* writer) {
return framer->AppendMaxStreamsFrame(frame, writer);
}
@@ -207,7 +207,7 @@
// static
bool QuicFramerPeer::ProcessMaxStreamsFrame(QuicFramer* framer,
QuicDataReader* reader,
- QuicMaxStreamIdFrame* frame,
+ QuicMaxStreamsFrame* frame,
uint64_t frame_type) {
return framer->ProcessMaxStreamsFrame(reader, frame, frame_type);
}
@@ -243,7 +243,7 @@
// static
bool QuicFramerPeer::AppendStreamsBlockedFrame(
QuicFramer* framer,
- const QuicStreamIdBlockedFrame& frame,
+ const QuicStreamsBlockedFrame& frame,
QuicDataWriter* writer) {
return framer->AppendStreamsBlockedFrame(frame, writer);
}
@@ -251,7 +251,7 @@
// static
bool QuicFramerPeer::ProcessStreamsBlockedFrame(QuicFramer* framer,
QuicDataReader* reader,
- QuicStreamIdBlockedFrame* frame,
+ QuicStreamsBlockedFrame* frame,
uint64_t frame_type) {
return framer->ProcessStreamsBlockedFrame(reader, frame, frame_type);
}
diff --git a/quic/test_tools/quic_framer_peer.h b/quic/test_tools/quic_framer_peer.h
index 7b23189..4a5efa6 100644
--- a/quic/test_tools/quic_framer_peer.h
+++ b/quic/test_tools/quic_framer_peer.h
@@ -111,11 +111,11 @@
QuicDataReader* reader,
QuicWindowUpdateFrame* frame);
static bool AppendMaxStreamsFrame(QuicFramer* framer,
- const QuicMaxStreamIdFrame& frame,
+ const QuicMaxStreamsFrame& frame,
QuicDataWriter* writer);
static bool ProcessMaxStreamsFrame(QuicFramer* framer,
QuicDataReader* reader,
- QuicMaxStreamIdFrame* frame,
+ QuicMaxStreamsFrame* frame,
uint64_t frame_type);
static bool AppendIetfBlockedFrame(QuicFramer* framer,
const QuicBlockedFrame& frame,
@@ -132,11 +132,11 @@
QuicBlockedFrame* frame);
static bool AppendStreamsBlockedFrame(QuicFramer* framer,
- const QuicStreamIdBlockedFrame& frame,
+ const QuicStreamsBlockedFrame& frame,
QuicDataWriter* writer);
static bool ProcessStreamsBlockedFrame(QuicFramer* framer,
QuicDataReader* reader,
- QuicStreamIdBlockedFrame* frame,
+ QuicStreamsBlockedFrame* frame,
uint64_t frame_type);
static bool AppendNewConnectionIdFrame(QuicFramer* framer,
diff --git a/quic/test_tools/quic_session_peer.cc b/quic/test_tools/quic_session_peer.cc
index 37e5013..176e22a 100644
--- a/quic/test_tools/quic_session_peer.cc
+++ b/quic/test_tools/quic_session_peer.cc
@@ -6,6 +6,7 @@
#include "net/third_party/quiche/src/quic/core/quic_session.h"
#include "net/third_party/quiche/src/quic/core/quic_stream.h"
+#include "net/third_party/quiche/src/quic/core/quic_utils.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_map_util.h"
namespace quic {
@@ -130,7 +131,7 @@
bool QuicSessionPeer::IsStreamAvailable(QuicSession* session, QuicStreamId id) {
DCHECK_NE(0u, id);
if (session->connection()->transport_version() == QUIC_VERSION_99) {
- if (id % kV99StreamIdIncrement < 2) {
+ if (id % QuicUtils::StreamIdDelta(QUIC_VERSION_99) < 2) {
return QuicContainsKey(
session->v99_streamid_manager_.bidirectional_stream_id_manager_
.available_streams_,
diff --git a/quic/test_tools/quic_stream_id_manager_peer.cc b/quic/test_tools/quic_stream_id_manager_peer.cc
index 705ee27..3ce5f1f 100644
--- a/quic/test_tools/quic_stream_id_manager_peer.cc
+++ b/quic/test_tools/quic_stream_id_manager_peer.cc
@@ -4,33 +4,26 @@
#include "net/third_party/quiche/src/quic/test_tools/quic_stream_id_manager_peer.h"
#include "net/third_party/quiche/src/quic/core/quic_stream_id_manager.h"
+#include "net/third_party/quiche/src/quic/core/quic_utils.h"
+#include "net/third_party/quiche/src/quic/core/uber_quic_stream_id_manager.h"
+#include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h"
+#include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
namespace quic {
namespace test {
// static
-void QuicStreamIdManagerPeer::IncrementMaximumAllowedOutgoingStreamId(
+void QuicStreamIdManagerPeer::set_incoming_actual_max_streams(
QuicStreamIdManager* stream_id_manager,
- int increment) {
- stream_id_manager->max_allowed_outgoing_stream_id_ +=
- (increment * kV99StreamIdIncrement);
+ QuicStreamCount count) {
+ stream_id_manager->incoming_actual_max_streams_ = count;
}
// static
-void QuicStreamIdManagerPeer::IncrementMaximumAllowedIncomingStreamId(
- QuicStreamIdManager* stream_id_manager,
- int increment) {
- stream_id_manager->actual_max_allowed_incoming_stream_id_ +=
- (increment * kV99StreamIdIncrement);
- stream_id_manager->advertised_max_allowed_incoming_stream_id_ +=
- (increment * kV99StreamIdIncrement);
+QuicStreamId QuicStreamIdManagerPeer::GetFirstIncomingStreamId(
+ QuicStreamIdManager* stream_id_manager) {
+ return stream_id_manager->GetFirstIncomingStreamId();
}
-// static
-void QuicStreamIdManagerPeer::SetMaxOpenIncomingStreams(
- QuicStreamIdManager* stream_id_manager,
- size_t max_streams) {
- stream_id_manager->SetMaxOpenIncomingStreams(max_streams);
-}
} // namespace test
} // namespace quic
diff --git a/quic/test_tools/quic_stream_id_manager_peer.h b/quic/test_tools/quic_stream_id_manager_peer.h
index 2ec07b1..cc78aee 100644
--- a/quic/test_tools/quic_stream_id_manager_peer.h
+++ b/quic/test_tools/quic_stream_id_manager_peer.h
@@ -6,23 +6,25 @@
#include <stddef.h>
+#include "net/third_party/quiche/src/quic/core/quic_types.h"
+
namespace quic {
class QuicStreamIdManager;
+class UberQuicStreamIdManager;
namespace test {
class QuicStreamIdManagerPeer {
public:
QuicStreamIdManagerPeer() = delete;
- static void IncrementMaximumAllowedOutgoingStreamId(
+
+ static void set_incoming_actual_max_streams(
QuicStreamIdManager* stream_id_manager,
- int increment);
- static void IncrementMaximumAllowedIncomingStreamId(
- QuicStreamIdManager* stream_id_manager,
- int increment);
- static void SetMaxOpenIncomingStreams(QuicStreamIdManager* stream_id_manager,
- size_t max_streams);
+ QuicStreamCount count);
+
+ static QuicStreamId GetFirstIncomingStreamId(
+ QuicStreamIdManager* stream_id_manager);
};
} // namespace test
diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc
index 870a7b8..cacb28a 100644
--- a/quic/test_tools/quic_test_utils.cc
+++ b/quic/test_tools/quic_test_utils.cc
@@ -202,9 +202,8 @@
ON_CALL(*this, OnPathResponseFrame(_)).WillByDefault(testing::Return(true));
ON_CALL(*this, OnGoAwayFrame(_)).WillByDefault(testing::Return(true));
- ON_CALL(*this, OnMaxStreamIdFrame(_)).WillByDefault(testing::Return(true));
- ON_CALL(*this, OnStreamIdBlockedFrame(_))
- .WillByDefault(testing::Return(true));
+ ON_CALL(*this, OnMaxStreamsFrame(_)).WillByDefault(testing::Return(true));
+ ON_CALL(*this, OnStreamsBlockedFrame(_)).WillByDefault(testing::Return(true));
}
MockFramerVisitor::~MockFramerVisitor() {}
@@ -310,12 +309,12 @@
return true;
}
-bool NoOpFramerVisitor::OnMaxStreamIdFrame(const QuicMaxStreamIdFrame& frame) {
+bool NoOpFramerVisitor::OnMaxStreamsFrame(const QuicMaxStreamsFrame& frame) {
return true;
}
-bool NoOpFramerVisitor::OnStreamIdBlockedFrame(
- const QuicStreamIdBlockedFrame& frame) {
+bool NoOpFramerVisitor::OnStreamsBlockedFrame(
+ const QuicStreamsBlockedFrame& frame) {
return true;
}
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h
index c888fef..3ce3e76 100644
--- a/quic/test_tools/quic_test_utils.h
+++ b/quic/test_tools/quic_test_utils.h
@@ -278,9 +278,9 @@
MOCK_METHOD1(OnPathChallengeFrame, bool(const QuicPathChallengeFrame& frame));
MOCK_METHOD1(OnPathResponseFrame, bool(const QuicPathResponseFrame& frame));
MOCK_METHOD1(OnGoAwayFrame, bool(const QuicGoAwayFrame& frame));
- MOCK_METHOD1(OnMaxStreamIdFrame, bool(const QuicMaxStreamIdFrame& frame));
- MOCK_METHOD1(OnStreamIdBlockedFrame,
- bool(const QuicStreamIdBlockedFrame& frame));
+ MOCK_METHOD1(OnMaxStreamsFrame, bool(const QuicMaxStreamsFrame& frame));
+ MOCK_METHOD1(OnStreamsBlockedFrame,
+ bool(const QuicStreamsBlockedFrame& frame));
MOCK_METHOD1(OnWindowUpdateFrame, bool(const QuicWindowUpdateFrame& frame));
MOCK_METHOD1(OnBlockedFrame, bool(const QuicBlockedFrame& frame));
MOCK_METHOD1(OnMessageFrame, bool(const QuicMessageFrame& frame));
@@ -329,8 +329,8 @@
bool OnPathChallengeFrame(const QuicPathChallengeFrame& frame) override;
bool OnPathResponseFrame(const QuicPathResponseFrame& frame) override;
bool OnGoAwayFrame(const QuicGoAwayFrame& frame) override;
- bool OnMaxStreamIdFrame(const QuicMaxStreamIdFrame& frame) override;
- bool OnStreamIdBlockedFrame(const QuicStreamIdBlockedFrame& frame) override;
+ bool OnMaxStreamsFrame(const QuicMaxStreamsFrame& frame) override;
+ bool OnStreamsBlockedFrame(const QuicStreamsBlockedFrame& frame) override;
bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) override;
bool OnBlockedFrame(const QuicBlockedFrame& frame) override;
bool OnMessageFrame(const QuicMessageFrame& frame) override;
@@ -377,9 +377,9 @@
MOCK_METHOD0(SendPing, void());
MOCK_CONST_METHOD0(AllowSelfAddressChange, bool());
MOCK_METHOD0(OnForwardProgressConfirmed, void());
- MOCK_METHOD1(OnMaxStreamIdFrame, bool(const QuicMaxStreamIdFrame& frame));
- MOCK_METHOD1(OnStreamIdBlockedFrame,
- bool(const QuicStreamIdBlockedFrame& frame));
+ MOCK_METHOD1(OnMaxStreamsFrame, bool(const QuicMaxStreamsFrame& frame));
+ MOCK_METHOD1(OnStreamsBlockedFrame,
+ bool(const QuicStreamsBlockedFrame& frame));
MOCK_METHOD1(OnStopSendingFrame, bool(const QuicStopSendingFrame& frame));
};
diff --git a/quic/test_tools/simple_quic_framer.cc b/quic/test_tools/simple_quic_framer.cc
index 6a90a79..028e2cd 100644
--- a/quic/test_tools/simple_quic_framer.cc
+++ b/quic/test_tools/simple_quic_framer.cc
@@ -160,13 +160,13 @@
goaway_frames_.push_back(frame);
return true;
}
- bool OnMaxStreamIdFrame(const QuicMaxStreamIdFrame& frame) override {
- max_stream_id_frames_.push_back(frame);
+ bool OnMaxStreamsFrame(const QuicMaxStreamsFrame& frame) override {
+ max_streams_frames_.push_back(frame);
return true;
}
- bool OnStreamIdBlockedFrame(const QuicStreamIdBlockedFrame& frame) override {
- stream_id_blocked_frames_.push_back(frame);
+ bool OnStreamsBlockedFrame(const QuicStreamsBlockedFrame& frame) override {
+ streams_blocked_frames_.push_back(frame);
return true;
}
@@ -206,12 +206,11 @@
const std::vector<QuicGoAwayFrame>& goaway_frames() const {
return goaway_frames_;
}
- const std::vector<QuicMaxStreamIdFrame>& max_stream_id_frames() const {
- return max_stream_id_frames_;
+ const std::vector<QuicMaxStreamsFrame>& max_streams_frames() const {
+ return max_streams_frames_;
}
- const std::vector<QuicStreamIdBlockedFrame>& stream_id_blocked_frames()
- const {
- return stream_id_blocked_frames_;
+ const std::vector<QuicStreamsBlockedFrame>& streams_blocked_frames() const {
+ return streams_blocked_frames_;
}
const std::vector<QuicRstStreamFrame>& rst_stream_frames() const {
return rst_stream_frames_;
@@ -261,8 +260,8 @@
std::vector<std::unique_ptr<QuicCryptoFrame>> crypto_frames_;
std::vector<QuicRstStreamFrame> rst_stream_frames_;
std::vector<QuicGoAwayFrame> goaway_frames_;
- std::vector<QuicStreamIdBlockedFrame> stream_id_blocked_frames_;
- std::vector<QuicMaxStreamIdFrame> max_stream_id_frames_;
+ std::vector<QuicStreamsBlockedFrame> streams_blocked_frames_;
+ std::vector<QuicMaxStreamsFrame> max_streams_frames_;
std::vector<QuicConnectionCloseFrame> connection_close_frames_;
std::vector<QuicStopSendingFrame> stop_sending_frames_;
std::vector<QuicPathChallengeFrame> path_challenge_frames_;
diff --git a/quic/test_tools/simulator/quic_endpoint.h b/quic/test_tools/simulator/quic_endpoint.h
index 955ac8f..7693b7b 100644
--- a/quic/test_tools/simulator/quic_endpoint.h
+++ b/quic/test_tools/simulator/quic_endpoint.h
@@ -107,10 +107,10 @@
void SendPing() override {}
bool AllowSelfAddressChange() const override;
void OnForwardProgressConfirmed() override {}
- bool OnMaxStreamIdFrame(const QuicMaxStreamIdFrame& frame) override {
+ bool OnMaxStreamsFrame(const QuicMaxStreamsFrame& frame) override {
return true;
}
- bool OnStreamIdBlockedFrame(const QuicStreamIdBlockedFrame& frame) override {
+ bool OnStreamsBlockedFrame(const QuicStreamsBlockedFrame& frame) override {
return true;
}
bool OnStopSendingFrame(const QuicStopSendingFrame& frame) override {
