diff --git a/quic/api/test/QuicTransportBaseTest.cpp b/quic/api/test/QuicTransportBaseTest.cpp index 72c6e2f33..c8a726c53 100644 --- a/quic/api/test/QuicTransportBaseTest.cpp +++ b/quic/api/test/QuicTransportBaseTest.cpp @@ -4285,7 +4285,7 @@ INSTANTIATE_TEST_SUITE_P( TEST_P(QuicTransportImplTestWithGroups, ReadCallbackWithGroupsDataAvailable) { auto transportSettings = transport->getTransportSettings(); - transportSettings.maxStreamGroupsAdvertized = 16; + transportSettings.advertisedMaxStreamGroups = 16; transport->setTransportSettings(transportSettings); transport->getConnectionState().streamManager->refreshTransportSettings( transportSettings); @@ -4335,7 +4335,7 @@ TEST_P(QuicTransportImplTestWithGroups, ReadCallbackWithGroupsDataAvailable) { TEST_P(QuicTransportImplTestWithGroups, ReadErrorCallbackWithGroups) { auto transportSettings = transport->getTransportSettings(); - transportSettings.maxStreamGroupsAdvertized = 16; + transportSettings.advertisedMaxStreamGroups = 16; transport->setTransportSettings(transportSettings); transport->getConnectionState().streamManager->refreshTransportSettings( transportSettings); @@ -4364,7 +4364,7 @@ TEST_P( QuicTransportImplTestWithGroups, ReadCallbackWithGroupsCancellCallbacks) { auto transportSettings = transport->getTransportSettings(); - transportSettings.maxStreamGroupsAdvertized = 16; + transportSettings.advertisedMaxStreamGroups = 16; transport->setTransportSettings(transportSettings); transport->getConnectionState().streamManager->refreshTransportSettings( transportSettings); @@ -4400,7 +4400,7 @@ TEST_P( TEST_P(QuicTransportImplTestWithGroups, onNewStreamsAndGroupsCallbacks) { auto transportSettings = transport->getTransportSettings(); - transportSettings.maxStreamGroupsAdvertized = 16; + transportSettings.advertisedMaxStreamGroups = 16; transport->setTransportSettings(transportSettings); transport->getConnectionState().streamManager->refreshTransportSettings( transportSettings); diff --git a/quic/client/QuicClientTransport.cpp b/quic/client/QuicClientTransport.cpp index 521e47ab5..0c203e4f0 100644 --- a/quic/client/QuicClientTransport.cpp +++ b/quic/client/QuicClientTransport.cpp @@ -1867,14 +1867,14 @@ void QuicClientTransport::maybeSendTransportKnobs() { } void QuicClientTransport::maybeEnableStreamGroups() { - if (conn_->transportSettings.maxStreamGroupsAdvertized == 0) { + if (conn_->transportSettings.advertisedMaxStreamGroups == 0) { return; } auto streamGroupsEnabledParam = std::make_unique( static_cast(TransportParameterId::stream_groups_enabled), - conn_->transportSettings.maxStreamGroupsAdvertized); + conn_->transportSettings.advertisedMaxStreamGroups); if (!setCustomTransportParameter( std::move(streamGroupsEnabledParam), customTransportParameters_)) { diff --git a/quic/client/state/ClientStateMachine.cpp b/quic/client/state/ClientStateMachine.cpp index a2d282431..8a5cd1022 100644 --- a/quic/client/state/ClientStateMachine.cpp +++ b/quic/client/state/ClientStateMachine.cpp @@ -132,7 +132,7 @@ void processServerInitialParams( serverParams.parameters); auto maxDatagramFrameSize = getIntegerParameter( TransportParameterId::max_datagram_frame_size, serverParams.parameters); - auto peerMaxStreamGroupsAdvertized = getIntegerParameter( + auto peerAdvertisedMaxStreamGroups = getIntegerParameter( static_cast( TransportParameterId::stream_groups_enabled), serverParams.parameters); @@ -248,8 +248,8 @@ void processServerInitialParams( conn.datagramState.maxWriteFrameSize = maxDatagramFrameSize.value(); } - if (peerMaxStreamGroupsAdvertized) { - conn.peerMaxStreamGroupsAdvertized = *peerMaxStreamGroupsAdvertized; + if (peerAdvertisedMaxStreamGroups) { + conn.peerAdvertisedMaxStreamGroups = *peerAdvertisedMaxStreamGroups; } if (isAckReceiveTimestampsEnabled.has_value() && diff --git a/quic/client/test/ClientStateMachineTest.cpp b/quic/client/test/ClientStateMachineTest.cpp index 276e8a918..2e747c924 100644 --- a/quic/client/test/ClientStateMachineTest.cpp +++ b/quic/client/test/ClientStateMachineTest.cpp @@ -208,7 +208,7 @@ TEST_P( processServerInitialParams(clientConn, serverTransportParams, 0); EXPECT_EQ( - clientConn.peerMaxStreamGroupsAdvertized, + clientConn.peerAdvertisedMaxStreamGroups, GetParam().expectedTransportSettingVal); } diff --git a/quic/samples/echo/EchoClient.h b/quic/samples/echo/EchoClient.h index a358e6ce9..1f1aaab24 100644 --- a/quic/samples/echo/EchoClient.h +++ b/quic/samples/echo/EchoClient.h @@ -219,7 +219,7 @@ class EchoClient : public quic::QuicSocket::ConnectionSetupCallback, settings.disableMigration = !enableMigration_; if (enableStreamGroups_) { settings.notifyOnNewStreamsExplicitly = true; - settings.maxStreamGroupsAdvertized = kNumTestStreamGroups; + settings.advertisedMaxStreamGroups = kNumTestStreamGroups; } quicClient_->setTransportSettings(settings); diff --git a/quic/samples/echo/EchoServer.h b/quic/samples/echo/EchoServer.h index 355943d29..910e67d9a 100644 --- a/quic/samples/echo/EchoServer.h +++ b/quic/samples/echo/EchoServer.h @@ -92,7 +92,7 @@ class EchoServer { settingsCopy.disableMigration = !enableMigration; if (enableStreamGroups) { settingsCopy.notifyOnNewStreamsExplicitly = true; - settingsCopy.maxStreamGroupsAdvertized = 1024; + settingsCopy.advertisedMaxStreamGroups = 1024; } server_->setTransportSettings(std::move(settingsCopy)); } diff --git a/quic/server/state/ServerStateMachine.cpp b/quic/server/state/ServerStateMachine.cpp index d2a10a7a8..5cdeed788 100644 --- a/quic/server/state/ServerStateMachine.cpp +++ b/quic/server/state/ServerStateMachine.cpp @@ -222,7 +222,7 @@ void processClientInitialParams( TransportParameterId::max_ack_delay, clientParams.parameters); auto maxDatagramFrameSize = getIntegerParameter( TransportParameterId::max_datagram_frame_size, clientParams.parameters); - auto peerMaxStreamGroupsAdvertized = getIntegerParameter( + auto peerAdvertisedMaxStreamGroups = getIntegerParameter( static_cast( TransportParameterId::stream_groups_enabled), clientParams.parameters); @@ -405,8 +405,8 @@ void processClientInitialParams( } } - if (peerMaxStreamGroupsAdvertized) { - conn.peerMaxStreamGroupsAdvertized = *peerMaxStreamGroupsAdvertized; + if (peerAdvertisedMaxStreamGroups) { + conn.peerAdvertisedMaxStreamGroups = *peerAdvertisedMaxStreamGroups; } if (isAckReceiveTimestampsEnabled.has_value() && isAckReceiveTimestampsEnabled.value() == 1) { @@ -1625,11 +1625,11 @@ std::vector setSupportedExtensionTransportParameters( customTransportParams.push_back(maxDatagramFrameSize->encode()); } - if (conn.transportSettings.maxStreamGroupsAdvertized > 0) { + if (conn.transportSettings.advertisedMaxStreamGroups > 0) { auto streamGroupsEnabledParam = std::make_unique( static_cast(TransportParameterId::stream_groups_enabled), - conn.transportSettings.maxStreamGroupsAdvertized); + conn.transportSettings.advertisedMaxStreamGroups); if (!setCustomTransportParameter( std::move(streamGroupsEnabledParam), customTransportParams)) { diff --git a/quic/server/test/ServerStateMachineTest.cpp b/quic/server/test/ServerStateMachineTest.cpp index 2656e7542..c6d24d38a 100644 --- a/quic/server/test/ServerStateMachineTest.cpp +++ b/quic/server/test/ServerStateMachineTest.cpp @@ -312,19 +312,19 @@ TEST(ServerStateMachineTest, TestProcessMaxRecvPacketSizeParams) { runMaxPacketSizeTestWithFixture(fixture); } -struct maxStreamGroupsAdvertizedtestStruct { +struct advertisedMaxStreamGroupstestStruct { uint64_t peerMaxGroupsIn; folly::Optional expectedTransportSettingVal; }; -class ServerStateMachineMaxStreamGroupsAdvertizedParamTest +class ServerStateMachineAdvertisedMaxStreamGroupsParamTest : public Test, public ::testing::WithParamInterface< - maxStreamGroupsAdvertizedtestStruct> {}; + advertisedMaxStreamGroupstestStruct> {}; TEST_P( - ServerStateMachineMaxStreamGroupsAdvertizedParamTest, - TestMaxStreamGroupsAdvertizedParam) { + ServerStateMachineAdvertisedMaxStreamGroupsParamTest, + TestAdvertisedMaxStreamGroupsParam) { QuicServerConnectionState serverConn( FizzServerQuicHandshakeContext::Builder().build()); std::vector transportParams; @@ -342,16 +342,16 @@ TEST_P( processClientInitialParams(serverConn, clientTransportParams); EXPECT_EQ( - serverConn.peerMaxStreamGroupsAdvertized, + serverConn.peerAdvertisedMaxStreamGroups, GetParam().expectedTransportSettingVal); } INSTANTIATE_TEST_SUITE_P( - ServerStateMachineMaxStreamGroupsAdvertizedParamTest, - ServerStateMachineMaxStreamGroupsAdvertizedParamTest, + ServerStateMachineAdvertisedMaxStreamGroupsParamTest, + ServerStateMachineAdvertisedMaxStreamGroupsParamTest, ::testing::Values( - maxStreamGroupsAdvertizedtestStruct{0, folly::none}, - maxStreamGroupsAdvertizedtestStruct{16, 16})); + advertisedMaxStreamGroupstestStruct{0, folly::none}, + advertisedMaxStreamGroupstestStruct{16, 16})); } // namespace test } // namespace quic diff --git a/quic/state/QuicStreamManager.cpp b/quic/state/QuicStreamManager.cpp index 4f1a31d4c..ef98fb93d 100644 --- a/quic/state/QuicStreamManager.cpp +++ b/quic/state/QuicStreamManager.cpp @@ -382,7 +382,7 @@ QuicStreamManager::createNextStreamGroup( StreamGroupId& groupId, folly::F14FastSet& streamGroups) { auto maxLocalStreamGroupId = std::min( - transportSettings_->maxStreamGroupsAdvertized * + transportSettings_->advertisedMaxStreamGroups * detail::kStreamGroupIncrement, detail::kMaxStreamGroupId); if (groupId >= maxLocalStreamGroupId) { @@ -435,7 +435,7 @@ QuicStreamState* FOLLY_NULLABLE QuicStreamManager::getOrCreatePeerStream( } auto maxPeerStreamGroupId = std::min( - transportSettings_->maxStreamGroupsAdvertized * + transportSettings_->advertisedMaxStreamGroups * detail::kStreamGroupIncrement, detail::kMaxStreamGroupId); if (*streamGroupId >= maxPeerStreamGroupId) { diff --git a/quic/state/StateData.h b/quic/state/StateData.h index c86ccef3b..77986fed3 100644 --- a/quic/state/StateData.h +++ b/quic/state/StateData.h @@ -780,8 +780,8 @@ struct QuicConnectionStateBase : public folly::DelayedDestruction { DatagramState datagramState; - // Peer max stream groups advertized. - folly::Optional peerMaxStreamGroupsAdvertized; + // Peer max stream groups advertised. + folly::Optional peerAdvertisedMaxStreamGroups; // Sequence number to use for the next ACK_FREQUENCY frame uint64_t nextAckFrequencyFrameSequenceNumber{0}; diff --git a/quic/state/TransportSettings.h b/quic/state/TransportSettings.h index a68d02880..701277bf1 100644 --- a/quic/state/TransportSettings.h +++ b/quic/state/TransportSettings.h @@ -326,7 +326,7 @@ struct TransportSettings { bool notifyOnNewStreamsExplicitly{false}; // Both peers must support stream groups; negotiated during handshake. // 0 means stream groups are disabled. - uint64_t maxStreamGroupsAdvertized{0}; + uint64_t advertisedMaxStreamGroups{0}; bool experimentalPacer{false}; // experimental flag to close ingress SM when invoking stopSending bool dropIngressOnStopSending{false}; diff --git a/quic/state/test/QuicStreamManagerTest.cpp b/quic/state/test/QuicStreamManagerTest.cpp index 2b12b8ebd..0e8fce0c2 100644 --- a/quic/state/test/QuicStreamManagerTest.cpp +++ b/quic/state/test/QuicStreamManagerTest.cpp @@ -781,7 +781,7 @@ TEST_P(QuicStreamManagerGroupsTest, TestStreamGroupLimits) { EXPECT_EQ(getNumGroups(), 0); // Bump group limits. - conn.transportSettings.maxStreamGroupsAdvertized = 1; + conn.transportSettings.advertisedMaxStreamGroups = 1; manager.refreshTransportSettings(conn.transportSettings); groupId = createNextStreamGroup(); EXPECT_TRUE(groupId.hasValue()); @@ -795,7 +795,7 @@ TEST_P(QuicStreamManagerGroupsTest, TestStreamGroupLimits) { TEST_P(QuicStreamManagerGroupsTest, TestStreamsCreationInGroupsNoGroup) { auto& manager = *conn.streamManager; - conn.transportSettings.maxStreamGroupsAdvertized = 16; + conn.transportSettings.advertisedMaxStreamGroups = 16; manager.refreshTransportSettings(conn.transportSettings); // Should throw because no stream groups exist yet. @@ -805,7 +805,7 @@ TEST_P(QuicStreamManagerGroupsTest, TestStreamsCreationInGroupsNoGroup) { TEST_P(QuicStreamManagerGroupsTest, TestStreamsCreationInGroupsWrongNodeType) { auto& manager = *conn.streamManager; - conn.transportSettings.maxStreamGroupsAdvertized = 16; + conn.transportSettings.advertisedMaxStreamGroups = 16; manager.refreshTransportSettings(conn.transportSettings); // Should throw because client stream group id is provided. @@ -815,7 +815,7 @@ TEST_P(QuicStreamManagerGroupsTest, TestStreamsCreationInGroupsWrongNodeType) { TEST_P(QuicStreamManagerGroupsTest, TestStreamsCreationInGroupsSuccess) { auto& manager = *conn.streamManager; - conn.transportSettings.maxStreamGroupsAdvertized = 16; + conn.transportSettings.advertisedMaxStreamGroups = 16; manager.refreshTransportSettings(conn.transportSettings); auto groupId = createNextStreamGroup(); @@ -838,7 +838,7 @@ TEST_P(QuicStreamManagerGroupsTest, TestPeerStreamsWithGroupDisabled) { TEST_P(QuicStreamManagerGroupsTest, TestPeerStreamsWithGroup) { auto& manager = *conn.streamManager; - conn.transportSettings.maxStreamGroupsAdvertized = 16; + conn.transportSettings.advertisedMaxStreamGroups = 16; manager.refreshTransportSettings(conn.transportSettings); const StreamId peerStreamId = 2; @@ -850,7 +850,7 @@ TEST_P(QuicStreamManagerGroupsTest, TestPeerStreamsWithGroup) { TEST_P(QuicStreamManagerGroupsTest, TestPeerStreamsWithGroupBadGroupId) { auto& manager = *conn.streamManager; - conn.transportSettings.maxStreamGroupsAdvertized = 16; + conn.transportSettings.advertisedMaxStreamGroups = 16; manager.refreshTransportSettings(conn.transportSettings); const StreamId peerStreamId = 2; @@ -862,7 +862,7 @@ TEST_P(QuicStreamManagerGroupsTest, TestPeerStreamsWithGroupBadGroupId) { TEST_P(QuicStreamManagerGroupsTest, TestPeerStreamsWithGroupAccounting) { auto& manager = *conn.streamManager; - conn.transportSettings.maxStreamGroupsAdvertized = 16; + conn.transportSettings.advertisedMaxStreamGroups = 16; manager.refreshTransportSettings(conn.transportSettings); StreamId peerStreamId = 2;