From 05d07cbfd0d1676b383cf8efab51e434cbe0a97a Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Sat, 9 Jan 2021 15:38:38 -0800 Subject: [PATCH] Apply clang-format update fixes Reviewed By: igorsugak Differential Revision: D25849213 fbshipit-source-id: a2a538230e769b2c328ae3dd0a19dfbfd693fe3b --- quic/api/QuicSocket.h | 5 +- quic/api/QuicStreamAsyncTransport.cpp | 1 + quic/api/QuicStreamAsyncTransport.h | 5 +- quic/api/QuicTransportBase.cpp | 13 +- quic/client/QuicClientAsyncTransport.cpp | 1 + quic/client/state/ClientStateMachine.cpp | 5 +- quic/client/test/ClientStateMachineTest.cpp | 1 + quic/codec/Decode.cpp | 1 + quic/codec/DefaultConnectionIdAlgo.cpp | 1 + quic/codec/PacketNumberCipher.cpp | 1 + quic/codec/QuicConnectionId.cpp | 1 + quic/codec/QuicHeaderCodec.cpp | 1 + quic/codec/QuicInteger.cpp | 1 + quic/codec/QuicReadCodec.cpp | 1 + quic/codec/Types.cpp | 1 + quic/codec/test/DecodeTest.cpp | 23 +- .../test/DefaultConnectionIdAlgoTest.cpp | 14 +- quic/codec/test/PacketNumberTest.cpp | 1 + quic/codec/test/QuicReadCodecTest.cpp | 16 +- quic/codec/test/QuicWriteCodecTest.cpp | 1 + quic/codec/test/TypesTest.cpp | 1 + quic/common/FunctionLooper.cpp | 1 + quic/common/test/BufAccessorTest.cpp | 1 + quic/common/test/FunctionLooperTest.cpp | 9 +- quic/common/test/IntervalSetTest.cpp | 1 + quic/common/test/TimeUtilTest.cpp | 1 + quic/common/test/TransportKnobsTest.cpp | 1 + quic/common/test/VariantTest.cpp | 1 + quic/common/test/WindowedCounterTest.cpp | 1 + quic/congestion_control/Bandwidth.cpp | 1 + quic/congestion_control/Bbr.cpp | 9 +- quic/congestion_control/Copa.cpp | 1 + quic/congestion_control/Copa2.cpp | 1 + quic/congestion_control/NewReno.cpp | 1 + quic/congestion_control/QuicCCP.cpp | 1 + quic/congestion_control/QuicCubic.cpp | 1 + .../congestion_control/test/BandwidthTest.cpp | 1 + .../test/BbrBandwidthSamplerTest.cpp | 1 + .../test/BbrRttSamplerTest.cpp | 1 + quic/congestion_control/test/BbrTest.cpp | 1 + quic/congestion_control/test/CubicTest.cpp | 19 +- quic/congestion_control/test/PacerTest.cpp | 1 + quic/d6d/Types.cpp | 1 + .../FizzRetryIntegrityTagGenerator.cpp | 1 + quic/fizz/handshake/QuicFizzFactory.cpp | 4 +- .../test/FizzPacketNumberCipherTest.cpp | 30 +-- .../server/handshake/FizzServerHandshake.cpp | 1 + quic/flowcontrol/QuicFlowController.cpp | 1 + quic/handshake/TransportParameters.cpp | 5 +- quic/logging/QLoggerTypes.cpp | 1 + quic/samples/echo/EchoClient.h | 5 +- quic/samples/echo/EchoHandler.h | 5 +- quic/samples/echo/EchoServer.h | 4 +- quic/server/CCPReader.cpp | 1 + quic/server/QuicServer.cpp | 4 +- quic/server/QuicServer.h | 11 +- quic/server/QuicServerWorker.cpp | 12 +- quic/server/QuicServerWorker.h | 4 +- .../async_tran/QuicAsyncTransportAcceptor.cpp | 1 + .../async_tran/QuicAsyncTransportAcceptor.h | 4 +- .../async_tran/QuicAsyncTransportServer.cpp | 1 + .../async_tran/QuicServerAsyncTransport.cpp | 1 + quic/server/handshake/RetryTokenGenerator.cpp | 1 + quic/server/handshake/test/AppTokenTest.cpp | 7 +- .../test/DefaultAppTokenValidatorTest.cpp | 14 +- .../test/RetryTokenGeneratorTest.cpp | 1 + .../test/StatelessResetGeneratorTest.cpp | 1 + .../server/state/ServerConnectionIdRejector.h | 4 +- quic/server/state/ServerStateMachine.h | 12 +- quic/server/test/Mocks.h | 4 +- quic/server/test/QuicServerTest.cpp | 201 +++++++++--------- quic/server/test/QuicServerTransportTest.cpp | 9 +- quic/state/PacketEvent.cpp | 5 +- quic/state/PendingPathRateLimiter.cpp | 1 + quic/state/QPRFunctions.cpp | 1 + quic/state/QuicStreamFunctions.cpp | 1 + quic/state/StateData.cpp | 13 +- quic/state/stream/StreamSendHandlers.cpp | 1 + quic/state/stream/StreamStateFunctions.cpp | 1 + .../stream/test/StreamStateFunctionsTest.cpp | 1 + quic/state/test/PacketEventTest.cpp | 1 + quic/tools/tperf/test/PacingObserverTest.cpp | 1 + quic/tools/tperf/tperf.cpp | 28 +-- 83 files changed, 316 insertions(+), 239 deletions(-) diff --git a/quic/api/QuicSocket.h b/quic/api/QuicSocket.h index d00b4e146..ed96f8e78 100644 --- a/quic/api/QuicSocket.h +++ b/quic/api/QuicSocket.h @@ -845,8 +845,9 @@ class QuicSocket { */ struct ByteEvent { enum class Type { ACK = 1, TX = 2 }; - static constexpr std::array kByteEventTypes = {Type::ACK, - Type::TX}; + static constexpr std::array kByteEventTypes = { + Type::ACK, + Type::TX}; StreamId id{0}; uint64_t offset{0}; diff --git a/quic/api/QuicStreamAsyncTransport.cpp b/quic/api/QuicStreamAsyncTransport.cpp index 20e51d0b0..e79eb319f 100644 --- a/quic/api/QuicStreamAsyncTransport.cpp +++ b/quic/api/QuicStreamAsyncTransport.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/api/QuicStreamAsyncTransport.h b/quic/api/QuicStreamAsyncTransport.h index c6c0e9ca9..b90907688 100644 --- a/quic/api/QuicStreamAsyncTransport.h +++ b/quic/api/QuicStreamAsyncTransport.h @@ -136,9 +136,8 @@ class QuicStreamAsyncTransport : public folly::AsyncTransport, // // QucSocket::WriteCallback overrides // - void onStreamWriteReady( - quic::StreamId /*id*/, - uint64_t maxToSend) noexcept override; + void onStreamWriteReady(quic::StreamId /*id*/, uint64_t maxToSend) noexcept + override; void onStreamWriteError( StreamId /*id*/, std::pair> diff --git a/quic/api/QuicTransportBase.cpp b/quic/api/QuicTransportBase.cpp index cac28734f..7b678f572 100644 --- a/quic/api/QuicTransportBase.cpp +++ b/quic/api/QuicTransportBase.cpp @@ -863,7 +863,7 @@ void QuicTransportBase::updateReadLooper() { auto iter = std::find_if( conn_->streamManager->readableStreams().begin(), conn_->streamManager->readableStreams().end(), - [& readCallbacks = readCallbacks_](StreamId s) { + [&readCallbacks = readCallbacks_](StreamId s) { auto readCb = readCallbacks.find(s); if (readCb == readCallbacks.end()) { return false; @@ -1210,7 +1210,7 @@ void QuicTransportBase::updatePeekLooper() { auto iter = std::find_if( conn_->streamManager->peekableStreams().begin(), conn_->streamManager->peekableStreams().end(), - [& peekCallbacks = peekCallbacks_](StreamId s) { + [&peekCallbacks = peekCallbacks_](StreamId s) { VLOG(10) << "Checking stream=" << s; auto peekCb = peekCallbacks.find(s); if (peekCb == peekCallbacks.end()) { @@ -3064,10 +3064,11 @@ QuicTransportBase::getStreamTransportInfo(StreamId id) const { } auto stream = conn_->streamManager->getStream(id); auto packets = getNumPacketsTxWithNewData(*stream); - return StreamTransportInfo{stream->totalHolbTime, - stream->holbCount, - bool(stream->lastHolbTime), - packets}; + return StreamTransportInfo{ + stream->totalHolbTime, + stream->holbCount, + bool(stream->lastHolbTime), + packets}; } void QuicTransportBase::describe(std::ostream& os) const { diff --git a/quic/client/QuicClientAsyncTransport.cpp b/quic/client/QuicClientAsyncTransport.cpp index 369da4ecb..60249f157 100644 --- a/quic/client/QuicClientAsyncTransport.cpp +++ b/quic/client/QuicClientAsyncTransport.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/client/state/ClientStateMachine.cpp b/quic/client/state/ClientStateMachine.cpp index 8bf2013f8..ae3198e41 100644 --- a/quic/client/state/ClientStateMachine.cpp +++ b/quic/client/state/ClientStateMachine.cpp @@ -182,9 +182,8 @@ void processServerInitialParams( auto windowSize = isUnidirectionalStream(s.id) ? conn.transportSettings.advertisedInitialUniStreamWindowSize : isLocalStream(conn.nodeType, s.id) - ? conn.transportSettings.advertisedInitialBidiLocalStreamWindowSize - : conn.transportSettings - .advertisedInitialBidiRemoteStreamWindowSize; + ? conn.transportSettings.advertisedInitialBidiLocalStreamWindowSize + : conn.transportSettings.advertisedInitialBidiRemoteStreamWindowSize; handleStreamWindowUpdate(s, windowSize, packetNum); }); } diff --git a/quic/client/test/ClientStateMachineTest.cpp b/quic/client/test/ClientStateMachineTest.cpp index 7fa130c77..aeadc67f4 100644 --- a/quic/client/test/ClientStateMachineTest.cpp +++ b/quic/client/test/ClientStateMachineTest.cpp @@ -1,6 +1,7 @@ // Copyright 2004-present Facebook. All Rights Reserved. #include + #include #include #include diff --git a/quic/codec/Decode.cpp b/quic/codec/Decode.cpp index 1759fe336..8e5bfb7f2 100644 --- a/quic/codec/Decode.cpp +++ b/quic/codec/Decode.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/codec/DefaultConnectionIdAlgo.cpp b/quic/codec/DefaultConnectionIdAlgo.cpp index 191fab4a0..8592fa788 100644 --- a/quic/codec/DefaultConnectionIdAlgo.cpp +++ b/quic/codec/DefaultConnectionIdAlgo.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/codec/PacketNumberCipher.cpp b/quic/codec/PacketNumberCipher.cpp index b3c3359b3..94064947b 100644 --- a/quic/codec/PacketNumberCipher.cpp +++ b/quic/codec/PacketNumberCipher.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/codec/QuicConnectionId.cpp b/quic/codec/QuicConnectionId.cpp index 61dac6ee3..7aebad80b 100644 --- a/quic/codec/QuicConnectionId.cpp +++ b/quic/codec/QuicConnectionId.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/codec/QuicHeaderCodec.cpp b/quic/codec/QuicHeaderCodec.cpp index 4a6ab81fa..a0d70ee35 100644 --- a/quic/codec/QuicHeaderCodec.cpp +++ b/quic/codec/QuicHeaderCodec.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/codec/QuicInteger.cpp b/quic/codec/QuicInteger.cpp index ea2e8af54..bb764cf31 100644 --- a/quic/codec/QuicInteger.cpp +++ b/quic/codec/QuicInteger.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/codec/QuicReadCodec.cpp b/quic/codec/QuicReadCodec.cpp index 48133ccce..822bdb4e6 100644 --- a/quic/codec/QuicReadCodec.cpp +++ b/quic/codec/QuicReadCodec.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/codec/Types.cpp b/quic/codec/Types.cpp index 8c8ceee1d..ccf702986 100644 --- a/quic/codec/Types.cpp +++ b/quic/codec/Types.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/codec/test/DecodeTest.cpp b/quic/codec/test/DecodeTest.cpp index 6d5f67996..76ded0ac4 100644 --- a/quic/codec/test/DecodeTest.cpp +++ b/quic/codec/test/DecodeTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include @@ -130,11 +131,12 @@ std::unique_ptr createCryptoFrame( TEST_F(DecodeTest, VersionNegotiationPacketDecodeTest) { ConnectionId srcCid = getTestConnectionId(0), destCid = getTestConnectionId(1); - std::vector versions{{static_cast(1234), - static_cast(4321), - static_cast(2341), - static_cast(3412), - static_cast(4123)}}; + std::vector versions{ + {static_cast(1234), + static_cast(4321), + static_cast(2341), + static_cast(3412), + static_cast(4123)}}; auto packet = VersionNegotiationPacketBuilder(srcCid, destCid, versions).buildPacket(); auto codec = std::make_unique(QuicNodeType::Server); @@ -151,11 +153,12 @@ TEST_F(DecodeTest, VersionNegotiationPacketDecodeTest) { TEST_F(DecodeTest, DifferentCIDLength) { ConnectionId sourceConnectionId = getTestConnectionId(); ConnectionId destinationConnectionId({1, 2, 3, 4, 5, 6}); - std::vector versions{{static_cast(1234), - static_cast(4321), - static_cast(2341), - static_cast(3412), - static_cast(4123)}}; + std::vector versions{ + {static_cast(1234), + static_cast(4321), + static_cast(2341), + static_cast(3412), + static_cast(4123)}}; auto packet = VersionNegotiationPacketBuilder( sourceConnectionId, destinationConnectionId, versions) .buildPacket(); diff --git a/quic/codec/test/DefaultConnectionIdAlgoTest.cpp b/quic/codec/test/DefaultConnectionIdAlgoTest.cpp index 137736521..ca7ebfee1 100644 --- a/quic/codec/test/DefaultConnectionIdAlgoTest.cpp +++ b/quic/codec/test/DefaultConnectionIdAlgoTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include @@ -49,12 +50,13 @@ TEST(DefaultConnectionIdAlgoTest, decodeV1) { TEST(DefaultConnectionIdAlgoTest, decodeV2) { DefaultConnectionIdAlgo al; - ConnectionId cid1({/*version*/ 0x80, - /*host*/ 0xAA, - 0xBB, - 0xCC, - /*worker*/ 0xFF, - /*process*/ 0x80}); + ConnectionId cid1( + {/*version*/ 0x80, + /*host*/ 0xAA, + 0xBB, + 0xCC, + /*worker*/ 0xFF, + /*process*/ 0x80}); EXPECT_TRUE(al.canParse(cid1)); auto params1 = al.parseConnectionId(cid1); EXPECT_EQ(params1->version, ConnectionIdVersion::V2); diff --git a/quic/codec/test/PacketNumberTest.cpp b/quic/codec/test/PacketNumberTest.cpp index 42e5b4a4a..cdab39244 100644 --- a/quic/codec/test/PacketNumberTest.cpp +++ b/quic/codec/test/PacketNumberTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/codec/test/QuicReadCodecTest.cpp b/quic/codec/test/QuicReadCodecTest.cpp index 7c6213ddd..d81c7f198 100644 --- a/quic/codec/test/QuicReadCodecTest.cpp +++ b/quic/codec/test/QuicReadCodecTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include @@ -79,13 +80,14 @@ TEST_F(QuicReadCodecTest, TooSmallBuffer) { TEST_F(QuicReadCodecTest, VersionNegotiationPacketTest) { auto srcConnId = getTestConnectionId(0), destConnId = getTestConnectionId(1); - std::vector versions({static_cast(1), - static_cast(2), - static_cast(3), - static_cast(4), - static_cast(567), - static_cast(76543), - static_cast(0xffff)}); + std::vector versions( + {static_cast(1), + static_cast(2), + static_cast(3), + static_cast(4), + static_cast(567), + static_cast(76543), + static_cast(0xffff)}); VersionNegotiationPacketBuilder builder(srcConnId, destConnId, versions); auto packet = std::move(builder).buildPacket(); auto packetQueue = bufToQueue(std::move(packet.second)); diff --git a/quic/codec/test/QuicWriteCodecTest.cpp b/quic/codec/test/QuicWriteCodecTest.cpp index 6c0fce5b4..bcd2b539b 100644 --- a/quic/codec/test/QuicWriteCodecTest.cpp +++ b/quic/codec/test/QuicWriteCodecTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/codec/test/TypesTest.cpp b/quic/codec/test/TypesTest.cpp index 3ab2ccaab..92fc1e3c2 100644 --- a/quic/codec/test/TypesTest.cpp +++ b/quic/codec/test/TypesTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/common/FunctionLooper.cpp b/quic/common/FunctionLooper.cpp index 3bdcfd9cd..84857f699 100644 --- a/quic/common/FunctionLooper.cpp +++ b/quic/common/FunctionLooper.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/common/test/BufAccessorTest.cpp b/quic/common/test/BufAccessorTest.cpp index 773512f2d..df8d1c10a 100644 --- a/quic/common/test/BufAccessorTest.cpp +++ b/quic/common/test/BufAccessorTest.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/common/test/FunctionLooperTest.cpp b/quic/common/test/FunctionLooperTest.cpp index 997e0d3c6..f0eedce16 100644 --- a/quic/common/test/FunctionLooperTest.cpp +++ b/quic/common/test/FunctionLooperTest.cpp @@ -7,6 +7,7 @@ */ #include + #include using namespace std; @@ -234,8 +235,8 @@ TEST(FunctionLooperTest, KeepPacing) { TEST(FunctionLooperTest, TimerTickSize) { EventBase evb; TimerHighRes::SharedPtr pacingTimer(TimerHighRes::newTimer(&evb, 123ms)); - FunctionLooper::Ptr looper( - new FunctionLooper(&evb, [&](bool) {}, LooperType::ReadLooper)); + FunctionLooper::Ptr looper(new FunctionLooper( + &evb, [&](bool) {}, LooperType::ReadLooper)); looper->setPacingTimer(std::move(pacingTimer)); EXPECT_EQ(123ms, looper->getTimerTickInterval()); } @@ -243,8 +244,8 @@ TEST(FunctionLooperTest, TimerTickSize) { TEST(FunctionLooperTest, TimerTickSizeAfterNewEvb) { EventBase evb; TimerHighRes::SharedPtr pacingTimer(TimerHighRes::newTimer(&evb, 123ms)); - FunctionLooper::Ptr looper( - new FunctionLooper(&evb, [&](bool) {}, LooperType::ReadLooper)); + FunctionLooper::Ptr looper(new FunctionLooper( + &evb, [&](bool) {}, LooperType::ReadLooper)); looper->setPacingTimer(std::move(pacingTimer)); EXPECT_EQ(123ms, looper->getTimerTickInterval()); looper->detachEventBase(); diff --git a/quic/common/test/IntervalSetTest.cpp b/quic/common/test/IntervalSetTest.cpp index 20cb3296c..1a5cdac39 100644 --- a/quic/common/test/IntervalSetTest.cpp +++ b/quic/common/test/IntervalSetTest.cpp @@ -7,6 +7,7 @@ */ #include + #include using namespace std; diff --git a/quic/common/test/TimeUtilTest.cpp b/quic/common/test/TimeUtilTest.cpp index 546ca3ee4..05c8c6fa8 100644 --- a/quic/common/test/TimeUtilTest.cpp +++ b/quic/common/test/TimeUtilTest.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/common/test/TransportKnobsTest.cpp b/quic/common/test/TransportKnobsTest.cpp index b8daa1764..bc7768f43 100644 --- a/quic/common/test/TransportKnobsTest.cpp +++ b/quic/common/test/TransportKnobsTest.cpp @@ -7,6 +7,7 @@ */ #include + #include using namespace ::testing; diff --git a/quic/common/test/VariantTest.cpp b/quic/common/test/VariantTest.cpp index e9f6ab14c..0c54260d8 100644 --- a/quic/common/test/VariantTest.cpp +++ b/quic/common/test/VariantTest.cpp @@ -7,6 +7,7 @@ */ #include + #include bool& destructor_called() { diff --git a/quic/common/test/WindowedCounterTest.cpp b/quic/common/test/WindowedCounterTest.cpp index 9cfa316d6..ae260fabd 100644 --- a/quic/common/test/WindowedCounterTest.cpp +++ b/quic/common/test/WindowedCounterTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/congestion_control/Bandwidth.cpp b/quic/congestion_control/Bandwidth.cpp index 3ef043179..4a7a4a407 100644 --- a/quic/congestion_control/Bandwidth.cpp +++ b/quic/congestion_control/Bandwidth.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/congestion_control/Bbr.cpp b/quic/congestion_control/Bbr.cpp index d66ae3e99..ff2a039ff 100644 --- a/quic/congestion_control/Bbr.cpp +++ b/quic/congestion_control/Bbr.cpp @@ -9,6 +9,7 @@ // Copyright 2004-present Facebook. All rights reserved. #include + #include #include #include @@ -464,8 +465,8 @@ bool BbrCongestionController::inRecovery() const noexcept { return recoveryState_ != BbrCongestionController::RecoveryState::NOT_RECOVERY; } -BbrCongestionController::BbrState BbrCongestionController::state() const - noexcept { +BbrCongestionController::BbrState BbrCongestionController::state() + const noexcept { return state_; } @@ -483,8 +484,8 @@ Bandwidth BbrCongestionController::bandwidth() const noexcept { return bandwidthSampler_ ? bandwidthSampler_->getBandwidth() : Bandwidth(); } -uint64_t BbrCongestionController::calculateTargetCwnd(float gain) const - noexcept { +uint64_t BbrCongestionController::calculateTargetCwnd( + float gain) const noexcept { auto bandwidthEst = bandwidth(); auto minRttEst = minRtt(); if (!bandwidthEst || minRttEst == 0us) { diff --git a/quic/congestion_control/Copa.cpp b/quic/congestion_control/Copa.cpp index c55ee3028..45eb3973d 100644 --- a/quic/congestion_control/Copa.cpp +++ b/quic/congestion_control/Copa.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/congestion_control/Copa2.cpp b/quic/congestion_control/Copa2.cpp index 330edb53e..402698fb1 100644 --- a/quic/congestion_control/Copa2.cpp +++ b/quic/congestion_control/Copa2.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/congestion_control/NewReno.cpp b/quic/congestion_control/NewReno.cpp index 7dfcf4746..f5b7f98cf 100644 --- a/quic/congestion_control/NewReno.cpp +++ b/quic/congestion_control/NewReno.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/congestion_control/QuicCCP.cpp b/quic/congestion_control/QuicCCP.cpp index 30e683ee2..c76327385 100644 --- a/quic/congestion_control/QuicCCP.cpp +++ b/quic/congestion_control/QuicCCP.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/congestion_control/QuicCubic.cpp b/quic/congestion_control/QuicCubic.cpp index b4557012c..e0eedc727 100644 --- a/quic/congestion_control/QuicCubic.cpp +++ b/quic/congestion_control/QuicCubic.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/congestion_control/test/BandwidthTest.cpp b/quic/congestion_control/test/BandwidthTest.cpp index b6f95e8bb..c4f1af36b 100644 --- a/quic/congestion_control/test/BandwidthTest.cpp +++ b/quic/congestion_control/test/BandwidthTest.cpp @@ -9,6 +9,7 @@ // Copyright 2004-present Facebook. All rights reserved. #include + #include using namespace testing; diff --git a/quic/congestion_control/test/BbrBandwidthSamplerTest.cpp b/quic/congestion_control/test/BbrBandwidthSamplerTest.cpp index 7af894f3a..899a69386 100644 --- a/quic/congestion_control/test/BbrBandwidthSamplerTest.cpp +++ b/quic/congestion_control/test/BbrBandwidthSamplerTest.cpp @@ -9,6 +9,7 @@ // Copyright 2004-present Facebook. All rights reserved. #include + #include #include #include diff --git a/quic/congestion_control/test/BbrRttSamplerTest.cpp b/quic/congestion_control/test/BbrRttSamplerTest.cpp index 13ee7ae6c..257c435e1 100644 --- a/quic/congestion_control/test/BbrRttSamplerTest.cpp +++ b/quic/congestion_control/test/BbrRttSamplerTest.cpp @@ -9,6 +9,7 @@ // Copyright 2004-present Facebook. All rights reserved. #include + #include #include diff --git a/quic/congestion_control/test/BbrTest.cpp b/quic/congestion_control/test/BbrTest.cpp index 607f35024..8b75996d3 100644 --- a/quic/congestion_control/test/BbrTest.cpp +++ b/quic/congestion_control/test/BbrTest.cpp @@ -9,6 +9,7 @@ // Copyright 2004-present Facebook. All rights reserved. #include + #include #include #include diff --git a/quic/congestion_control/test/CubicTest.cpp b/quic/congestion_control/test/CubicTest.cpp index d330a7310..3166b99ac 100644 --- a/quic/congestion_control/test/CubicTest.cpp +++ b/quic/congestion_control/test/CubicTest.cpp @@ -80,15 +80,16 @@ TEST_F(CubicTest, PersistentCongestion) { std::vector indices = getQLogEventIndices(QLogEventType::CongestionMetricUpdate, qLogger); EXPECT_EQ(indices.size(), 9); - std::array congestionEventArr = {kRemoveInflight, - kCubicLoss, - kPersistentCongestion, - kCongestionPacketAck, - kResetTimeToOrigin, - kResetLastReductionTime, - kCubicSteadyCwnd, - kCwndNoChange, - kCongestionPacketAck}; + std::array congestionEventArr = { + kRemoveInflight, + kCubicLoss, + kPersistentCongestion, + kCongestionPacketAck, + kResetTimeToOrigin, + kResetLastReductionTime, + kCubicSteadyCwnd, + kCwndNoChange, + kCongestionPacketAck}; std::array stateArr = { cubicStateToString(CubicStates::Hystart), diff --git a/quic/congestion_control/test/PacerTest.cpp b/quic/congestion_control/test/PacerTest.cpp index 069e6ed69..0a449c201 100644 --- a/quic/congestion_control/test/PacerTest.cpp +++ b/quic/congestion_control/test/PacerTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/d6d/Types.cpp b/quic/d6d/Types.cpp index e6eea3bb8..b79c4d987 100644 --- a/quic/d6d/Types.cpp +++ b/quic/d6d/Types.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/fizz/handshake/FizzRetryIntegrityTagGenerator.cpp b/quic/fizz/handshake/FizzRetryIntegrityTagGenerator.cpp index 5c54699e1..7e92cfc27 100644 --- a/quic/fizz/handshake/FizzRetryIntegrityTagGenerator.cpp +++ b/quic/fizz/handshake/FizzRetryIntegrityTagGenerator.cpp @@ -1,6 +1,7 @@ // Copyright 2004-present Facebook. All Rights Reserved. #include + #include #include #include diff --git a/quic/fizz/handshake/QuicFizzFactory.cpp b/quic/fizz/handshake/QuicFizzFactory.cpp index dfa8a7fc8..f9e8bd68b 100644 --- a/quic/fizz/handshake/QuicFizzFactory.cpp +++ b/quic/fizz/handshake/QuicFizzFactory.cpp @@ -57,8 +57,8 @@ class QuicPlaintextWriteRecordLayer : public fizz::PlaintextWriteRecordLayer { fizz::TLSContent writeInitialClientHello( std::unique_ptr encodedClientHello) const override { - return write(fizz::TLSMessage{fizz::ContentType::handshake, - std::move(encodedClientHello)}); + return write(fizz::TLSMessage{ + fizz::ContentType::handshake, std::move(encodedClientHello)}); } }; diff --git a/quic/fizz/handshake/test/FizzPacketNumberCipherTest.cpp b/quic/fizz/handshake/test/FizzPacketNumberCipherTest.cpp index 4b5cecbcf..4c0e5983b 100644 --- a/quic/fizz/handshake/test/FizzPacketNumberCipherTest.cpp +++ b/quic/fizz/handshake/test/FizzPacketNumberCipherTest.cpp @@ -93,20 +93,22 @@ INSTANTIATE_TEST_CASE_P( LongPacketNumberCipherTests, LongPacketNumberCipherTest, ::testing::Values( - HeaderParams{fizz::CipherSuite::TLS_AES_128_GCM_SHA256, - folly::StringPiece{"0edd982a6ac527f2eddcbb7348dea5d7"}, - folly::StringPiece{"0000f3a694c75775b4e546172ce9e047"}, - folly::StringPiece{"0dbc195a"}, - folly::StringPiece{"c1"}, - folly::StringPiece{"00000002"}, - folly::StringPiece{"c3"}}, - HeaderParams{fizz::CipherSuite::TLS_AES_128_GCM_SHA256, - folly::StringPiece{"94b9452d2b3c7c7f6da7fdd8593537fd"}, - folly::StringPiece{"c4c2a2303d297e3c519bf6b22386e3d0"}, - folly::StringPiece{"f7ed5f01"}, - folly::StringPiece{"c4"}, - folly::StringPiece{"00015f01"}, - folly::StringPiece{"c1"}}, + HeaderParams{ + fizz::CipherSuite::TLS_AES_128_GCM_SHA256, + folly::StringPiece{"0edd982a6ac527f2eddcbb7348dea5d7"}, + folly::StringPiece{"0000f3a694c75775b4e546172ce9e047"}, + folly::StringPiece{"0dbc195a"}, + folly::StringPiece{"c1"}, + folly::StringPiece{"00000002"}, + folly::StringPiece{"c3"}}, + HeaderParams{ + fizz::CipherSuite::TLS_AES_128_GCM_SHA256, + folly::StringPiece{"94b9452d2b3c7c7f6da7fdd8593537fd"}, + folly::StringPiece{"c4c2a2303d297e3c519bf6b22386e3d0"}, + folly::StringPiece{"f7ed5f01"}, + folly::StringPiece{"c4"}, + folly::StringPiece{"00015f01"}, + folly::StringPiece{"c1"}}, HeaderParams{ fizz::CipherSuite::TLS_AES_256_GCM_SHA384, folly::StringPiece{ diff --git a/quic/fizz/server/handshake/FizzServerHandshake.cpp b/quic/fizz/server/handshake/FizzServerHandshake.cpp index 20941bf2c..66df46997 100644 --- a/quic/fizz/server/handshake/FizzServerHandshake.cpp +++ b/quic/fizz/server/handshake/FizzServerHandshake.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/flowcontrol/QuicFlowController.cpp b/quic/flowcontrol/QuicFlowController.cpp index 47422e83d..598eb7509 100644 --- a/quic/flowcontrol/QuicFlowController.cpp +++ b/quic/flowcontrol/QuicFlowController.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/handshake/TransportParameters.cpp b/quic/handshake/TransportParameters.cpp index e78e153ce..9277b9cf1 100644 --- a/quic/handshake/TransportParameters.cpp +++ b/quic/handshake/TransportParameters.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { @@ -90,8 +91,8 @@ CustomStringTransportParameter::CustomStringTransportParameter( : CustomTransportParameter(id), value_(value) {} TransportParameter CustomStringTransportParameter::encode() const { - return {static_cast(id_), - folly::IOBuf::copyBuffer(value_)}; + return { + static_cast(id_), folly::IOBuf::copyBuffer(value_)}; } CustomBlobTransportParameter::CustomBlobTransportParameter( diff --git a/quic/logging/QLoggerTypes.cpp b/quic/logging/QLoggerTypes.cpp index d9e978d6f..92ceded68 100644 --- a/quic/logging/QLoggerTypes.cpp +++ b/quic/logging/QLoggerTypes.cpp @@ -6,6 +6,7 @@ * */ #include + #include #include diff --git a/quic/samples/echo/EchoClient.h b/quic/samples/echo/EchoClient.h index e6f0708e7..8a5627938 100644 --- a/quic/samples/echo/EchoClient.h +++ b/quic/samples/echo/EchoClient.h @@ -91,9 +91,8 @@ class EchoClient : public quic::QuicSocket::ConnectionCallback, startDone_.post(); } - void onStreamWriteReady( - quic::StreamId id, - uint64_t maxToSend) noexcept override { + void onStreamWriteReady(quic::StreamId id, uint64_t maxToSend) noexcept + override { LOG(INFO) << "EchoClient socket is write ready with maxToSend=" << maxToSend; sendMessage(id, pendingOutput_[id]); diff --git a/quic/samples/echo/EchoHandler.h b/quic/samples/echo/EchoHandler.h index cecc8154a..4cb79a874 100644 --- a/quic/samples/echo/EchoHandler.h +++ b/quic/samples/echo/EchoHandler.h @@ -150,9 +150,8 @@ class EchoHandler : public quic::QuicSocket::ConnectionCallback, } } - void onStreamWriteReady( - quic::StreamId id, - uint64_t maxToSend) noexcept override { + void onStreamWriteReady(quic::StreamId id, uint64_t maxToSend) noexcept + override { LOG(INFO) << "socket is write ready with maxToSend=" << maxToSend; echo(id, input_[id]); } diff --git a/quic/samples/echo/EchoServer.h b/quic/samples/echo/EchoServer.h index e0ad5b226..b74d6ecbe 100644 --- a/quic/samples/echo/EchoServer.h +++ b/quic/samples/echo/EchoServer.h @@ -41,8 +41,8 @@ class EchoServerTransportFactory : public quic::QuicServerTransportFactory { folly::EventBase* evb, std::unique_ptr sock, const folly::SocketAddress&, - std::shared_ptr - ctx) noexcept override { + std::shared_ptr ctx) noexcept + override { CHECK_EQ(evb, sock->getEventBase()); auto echoHandler = std::make_unique(evb, prEnabled_); auto transport = quic::QuicServerTransport::make( diff --git a/quic/server/CCPReader.cpp b/quic/server/CCPReader.cpp index 4b560dd16..06666f36e 100644 --- a/quic/server/CCPReader.cpp +++ b/quic/server/CCPReader.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/server/QuicServer.cpp b/quic/server/QuicServer.cpp index c2e4a3c8a..816cf2a17 100644 --- a/quic/server/QuicServer.cpp +++ b/quic/server/QuicServer.cpp @@ -751,8 +751,8 @@ void QuicServer::getAllConnectionsStats( [&stats](auto worker) mutable { worker->getAllConnectionsStats(stats); }); } -TakeoverProtocolVersion QuicServer::getTakeoverProtocolVersion() const - noexcept { +TakeoverProtocolVersion QuicServer::getTakeoverProtocolVersion() + const noexcept { return workers_[0]->getTakeoverProtocolVersion(); } diff --git a/quic/server/QuicServer.h b/quic/server/QuicServer.h index 1885a9679..21ee7ff2b 100644 --- a/quic/server/QuicServer.h +++ b/quic/server/QuicServer.h @@ -393,11 +393,12 @@ class QuicServer : public QuicServerWorker::WorkerCallback, const folly::SocketAddress& address, const std::vector& evbs); - std::vector supportedVersions_{{QuicVersion::MVFST, - QuicVersion::MVFST_D24, - QuicVersion::MVFST_EXPERIMENTAL, - QuicVersion::QUIC_DRAFT, - QuicVersion::QUIC_DRAFT_LEGACY}}; + std::vector supportedVersions_{ + {QuicVersion::MVFST, + QuicVersion::MVFST_D24, + QuicVersion::MVFST_EXPERIMENTAL, + QuicVersion::QUIC_DRAFT, + QuicVersion::QUIC_DRAFT_LEGACY}}; bool isUsingCCP(); diff --git a/quic/server/QuicServerWorker.cpp b/quic/server/QuicServerWorker.cpp index 287d78984..b11269d90 100644 --- a/quic/server/QuicServerWorker.cpp +++ b/quic/server/QuicServerWorker.cpp @@ -118,8 +118,8 @@ void QuicServerWorker::setTransportStatsCallback( statsCallback_ = std::move(statsCallback); } -QuicTransportStatsCallback* QuicServerWorker::getTransportStatsCallback() const - noexcept { +QuicTransportStatsCallback* QuicServerWorker::getTransportStatsCallback() + const noexcept { return statsCallback_.get(); } @@ -982,8 +982,8 @@ int QuicServerWorker::getTakeoverHandlerSocketFD() { return takeoverCB_->getSocketFD(); } -TakeoverProtocolVersion QuicServerWorker::getTakeoverProtocolVersion() const - noexcept { +TakeoverProtocolVersion QuicServerWorker::getTakeoverProtocolVersion() + const noexcept { return takeoverPktHandler_.getTakeoverProtocolVersion(); } @@ -1225,8 +1225,8 @@ QuicServerWorker::~QuicServerWorker() { shutdownAllConnections(LocalErrorCode::SHUTTING_DOWN); } -bool QuicServerWorker::rejectConnectionId(const ConnectionId& candidate) const - noexcept { +bool QuicServerWorker::rejectConnectionId( + const ConnectionId& candidate) const noexcept { return connectionIdMap_.find(candidate) != connectionIdMap_.end(); } diff --git a/quic/server/QuicServerWorker.h b/quic/server/QuicServerWorker.h index 1665c902f..b65ad20bc 100644 --- a/quic/server/QuicServerWorker.h +++ b/quic/server/QuicServerWorker.h @@ -363,8 +363,8 @@ class QuicServerWorker : public folly::AsyncUDPSocket::ReadCallback, const std::vector& connectionIdData) noexcept override; // From ServerConnectionIdRejector: - bool rejectConnectionId(const ConnectionId& candidate) const - noexcept override; + bool rejectConnectionId( + const ConnectionId& candidate) const noexcept override; void onReadError(const folly::AsyncSocketException& ex) noexcept override; diff --git a/quic/server/async_tran/QuicAsyncTransportAcceptor.cpp b/quic/server/async_tran/QuicAsyncTransportAcceptor.cpp index 4295ee176..e9c5c15ed 100644 --- a/quic/server/async_tran/QuicAsyncTransportAcceptor.cpp +++ b/quic/server/async_tran/QuicAsyncTransportAcceptor.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/server/async_tran/QuicAsyncTransportAcceptor.h b/quic/server/async_tran/QuicAsyncTransportAcceptor.h index b446d98ba..90a969458 100644 --- a/quic/server/async_tran/QuicAsyncTransportAcceptor.h +++ b/quic/server/async_tran/QuicAsyncTransportAcceptor.h @@ -30,8 +30,8 @@ class QuicAsyncTransportAcceptor : public wangle::Acceptor, folly::EventBase* evb, std::unique_ptr sock, const folly::SocketAddress&, - std::shared_ptr - ctx) noexcept override; + std::shared_ptr ctx) noexcept + override; private: ManagedConnectionFactory connectionFactory_; diff --git a/quic/server/async_tran/QuicAsyncTransportServer.cpp b/quic/server/async_tran/QuicAsyncTransportServer.cpp index ba2c737be..d11a8556c 100644 --- a/quic/server/async_tran/QuicAsyncTransportServer.cpp +++ b/quic/server/async_tran/QuicAsyncTransportServer.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/server/async_tran/QuicServerAsyncTransport.cpp b/quic/server/async_tran/QuicServerAsyncTransport.cpp index 4317cc836..e4a050208 100644 --- a/quic/server/async_tran/QuicServerAsyncTransport.cpp +++ b/quic/server/async_tran/QuicServerAsyncTransport.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/server/handshake/RetryTokenGenerator.cpp b/quic/server/handshake/RetryTokenGenerator.cpp index e2fd2c3a4..f1ea47447 100644 --- a/quic/server/handshake/RetryTokenGenerator.cpp +++ b/quic/server/handshake/RetryTokenGenerator.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/server/handshake/test/AppTokenTest.cpp b/quic/server/handshake/test/AppTokenTest.cpp index 971e8b954..68efe2cc7 100644 --- a/quic/server/handshake/test/AppTokenTest.cpp +++ b/quic/server/handshake/test/AppTokenTest.cpp @@ -175,9 +175,10 @@ TEST(AppTokenTest, TestEncodeAndDecodeThreeIPv4Addresses) { kDefaultStreamWindowSize, std::numeric_limits::max(), std::numeric_limits::max()); - appToken.sourceAddresses = {folly::IPAddress("1.2.3.4"), - folly::IPAddress("1.2.3.5"), - folly::IPAddress("1.2.3.6")}; + appToken.sourceAddresses = { + folly::IPAddress("1.2.3.4"), + folly::IPAddress("1.2.3.5"), + folly::IPAddress("1.2.3.6")}; appToken.version = QuicVersion::MVFST; Buf buf = encodeAppToken(appToken); diff --git a/quic/server/handshake/test/DefaultAppTokenValidatorTest.cpp b/quic/server/handshake/test/DefaultAppTokenValidatorTest.cpp index 18b6bfca1..d95c48f66 100644 --- a/quic/server/handshake/test/DefaultAppTokenValidatorTest.cpp +++ b/quic/server/handshake/test/DefaultAppTokenValidatorTest.cpp @@ -366,9 +366,10 @@ TEST_F(SourceAddressTokenTest, OneSourceTokensNoMatch) { } TEST_F(SourceAddressTokenTest, MaxNumSourceTokensNoMatch) { - appToken_.sourceAddresses = {folly::IPAddress("1.2.3.5"), - folly::IPAddress("1.2.3.6"), - folly::IPAddress("1.2.3.7")}; + appToken_.sourceAddresses = { + folly::IPAddress("1.2.3.5"), + folly::IPAddress("1.2.3.6"), + folly::IPAddress("1.2.3.7")}; encodeAndValidate(); EXPECT_EQ( @@ -393,9 +394,10 @@ TEST_F(SourceAddressTokenTest, OneSourceTokensMatch) { } TEST_F(SourceAddressTokenTest, ThreeSourceTokensMatch) { - appToken_.sourceAddresses = {folly::IPAddress("1.2.3.5"), - folly::IPAddress("1.2.3.4"), - folly::IPAddress("1.2.3.7")}; + appToken_.sourceAddresses = { + folly::IPAddress("1.2.3.5"), + folly::IPAddress("1.2.3.4"), + folly::IPAddress("1.2.3.7")}; encodeAndValidate(); EXPECT_FALSE(conn_.writableBytesLimit); diff --git a/quic/server/handshake/test/RetryTokenGeneratorTest.cpp b/quic/server/handshake/test/RetryTokenGeneratorTest.cpp index 50ba96eba..b373a3cb0 100644 --- a/quic/server/handshake/test/RetryTokenGeneratorTest.cpp +++ b/quic/server/handshake/test/RetryTokenGeneratorTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/server/handshake/test/StatelessResetGeneratorTest.cpp b/quic/server/handshake/test/StatelessResetGeneratorTest.cpp index c18aa8e93..a499cdfe7 100644 --- a/quic/server/handshake/test/StatelessResetGeneratorTest.cpp +++ b/quic/server/handshake/test/StatelessResetGeneratorTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/server/state/ServerConnectionIdRejector.h b/quic/server/state/ServerConnectionIdRejector.h index 3ceb039f2..918da482c 100644 --- a/quic/server/state/ServerConnectionIdRejector.h +++ b/quic/server/state/ServerConnectionIdRejector.h @@ -22,8 +22,8 @@ namespace quic { class ServerConnectionIdRejector { public: virtual ~ServerConnectionIdRejector() = default; - virtual bool rejectConnectionId(const ConnectionId& candidate) const - noexcept = 0; + virtual bool rejectConnectionId( + const ConnectionId& candidate) const noexcept = 0; }; } // namespace quic diff --git a/quic/server/state/ServerStateMachine.h b/quic/server/state/ServerStateMachine.h index 6e8635e4a..fc6d67dbe 100644 --- a/quic/server/state/ServerStateMachine.h +++ b/quic/server/state/ServerStateMachine.h @@ -152,12 +152,12 @@ struct QuicServerConnectionState : public QuicConnectionStateBase { // TODO: this is wrong, it should be the handshake finish time. But i need // a relatively sane time now to make the timestamps all sane. connectionTime = Clock::now(); - supportedVersions = - std::vector{{QuicVersion::MVFST, - QuicVersion::MVFST_D24, - QuicVersion::MVFST_EXPERIMENTAL, - QuicVersion::QUIC_DRAFT, - QuicVersion::QUIC_DRAFT_LEGACY}}; + supportedVersions = std::vector{ + {QuicVersion::MVFST, + QuicVersion::MVFST_D24, + QuicVersion::MVFST_EXPERIMENTAL, + QuicVersion::QUIC_DRAFT, + QuicVersion::QUIC_DRAFT_LEGACY}}; originalVersion = QuicVersion::MVFST; DCHECK(handshakeFactory); auto tmpServerHandshake = handshakeFactory->makeServerHandshake(this); diff --git a/quic/server/test/Mocks.h b/quic/server/test/Mocks.h index ff403710c..79cfb5cd6 100644 --- a/quic/server/test/Mocks.h +++ b/quic/server/test/Mocks.h @@ -41,8 +41,8 @@ class MockQuicServerTransportFactory : public QuicServerTransportFactory { folly::EventBase* evb, std::unique_ptr socket, const folly::SocketAddress& addr, - std::shared_ptr - ctx) noexcept override { + std::shared_ptr ctx) noexcept + override { return _make(evb, socket, addr, ctx); } diff --git a/quic/server/test/QuicServerTest.cpp b/quic/server/test/QuicServerTest.cpp index 0adeaf976..5da1a012f 100644 --- a/quic/server/test/QuicServerTest.cpp +++ b/quic/server/test/QuicServerTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include @@ -701,8 +702,8 @@ TEST_F(QuicServerWorkerTest, QuicServerMultipleConnIdsRouting) { worker_->onConnectionUnbound( transport_.get(), std::make_pair(kClientAddr, connId), - std::vector{ConnectionIdData{connId, 0}, - ConnectionIdData{connId2, 1}}); + std::vector{ + ConnectionIdData{connId, 0}, ConnectionIdData{connId2, 1}}); EXPECT_EQ(connIdMap.count(connId), 0); EXPECT_EQ(addrMap.count(std::make_pair(kClientAddr, connId)), 0); @@ -1781,45 +1782,49 @@ class QuicServerTest : public Test { eventBase, std::move(mockSock), cb, quic::test::createServerCtx()); }); - auto makeTransport = [&]( - folly::EventBase * evb, - std::unique_ptr& /* socket */, - const folly::SocketAddress&, - std::shared_ptr) noexcept { - // set proper expectations for the transport after its creation - EXPECT_CALL(*transport, getEventBase()).WillRepeatedly(Return(evb)); - EXPECT_CALL(*transport, setTransportStatsCallback(_)) - .WillOnce(Invoke([&](QuicTransportStatsCallback* statsCallback) { - CHECK(statsCallback); - })); - EXPECT_CALL(*transport, setTransportSettings(_)) - .WillRepeatedly(Invoke([&](auto transportSettings) { - EXPECT_EQ( - transportSettings_.advertisedInitialBidiLocalStreamWindowSize, - transportSettings.advertisedInitialBidiLocalStreamWindowSize); - EXPECT_EQ( - transportSettings_.advertisedInitialBidiRemoteStreamWindowSize, - transportSettings.advertisedInitialBidiRemoteStreamWindowSize); - EXPECT_EQ( - transportSettings_.advertisedInitialUniStreamWindowSize, - transportSettings.advertisedInitialUniStreamWindowSize); - EXPECT_EQ( - transportSettings_.advertisedInitialConnectionWindowSize, - transportSettings.advertisedInitialConnectionWindowSize); - })); - ON_CALL(*transport, onNetworkData(_, _)) - .WillByDefault(Invoke( - [&, expected = std::shared_ptr(data->clone())]( - auto, const auto& networkData) mutable { - EXPECT_GT(networkData.packets.size(), 0); - EXPECT_TRUE( - folly::IOBufEqualTo()(*networkData.packets[0], *expected)); - std::unique_lock lg(m); - calledOnNetworkData = true; - cv.notify_one(); + auto makeTransport = + [&](folly::EventBase* evb, + std::unique_ptr& /* socket */, + const folly::SocketAddress&, + std::shared_ptr) noexcept { + // set proper expectations for the transport after its creation + EXPECT_CALL(*transport, getEventBase()).WillRepeatedly(Return(evb)); + EXPECT_CALL(*transport, setTransportStatsCallback(_)) + .WillOnce(Invoke([&](QuicTransportStatsCallback* statsCallback) { + CHECK(statsCallback); })); - return transport; - }; + EXPECT_CALL(*transport, setTransportSettings(_)) + .WillRepeatedly(Invoke([&](auto transportSettings) { + EXPECT_EQ( + transportSettings_ + .advertisedInitialBidiLocalStreamWindowSize, + transportSettings + .advertisedInitialBidiLocalStreamWindowSize); + EXPECT_EQ( + transportSettings_ + .advertisedInitialBidiRemoteStreamWindowSize, + transportSettings + .advertisedInitialBidiRemoteStreamWindowSize); + EXPECT_EQ( + transportSettings_.advertisedInitialUniStreamWindowSize, + transportSettings.advertisedInitialUniStreamWindowSize); + EXPECT_EQ( + transportSettings_.advertisedInitialConnectionWindowSize, + transportSettings.advertisedInitialConnectionWindowSize); + })); + ON_CALL(*transport, onNetworkData(_, _)) + .WillByDefault(Invoke( + [&, expected = std::shared_ptr(data->clone())]( + auto, const auto& networkData) mutable { + EXPECT_GT(networkData.packets.size(), 0); + EXPECT_TRUE(folly::IOBufEqualTo()( + *networkData.packets[0], *expected)); + std::unique_lock lg(m); + calledOnNetworkData = true; + cv.notify_one(); + })); + return transport; + }; EXPECT_CALL(*factory_, _make(_, _, _, _)).WillOnce(Invoke(makeTransport)); // send packets to the server std::unique_lock lg(m); @@ -2040,37 +2045,39 @@ class QuicServerTakeoverTest : public Test { folly::Baton<>& baton) { std::shared_ptr transport; NiceMock cb; - auto makeTransport = [&]( - folly::EventBase * eventBase, - std::unique_ptr & socket, - const folly::SocketAddress&, - std::shared_ptr ctx) noexcept { - transport = std::make_shared( - eventBase, std::move(socket), cb, ctx); - transport->setClientConnectionId(clientConnId); - // setup expectations - EXPECT_CALL(*transport, getEventBase()).WillRepeatedly(Return(eventBase)); - EXPECT_CALL(*transport, setTransportSettings(_)); - EXPECT_CALL(*transport, accept()); - EXPECT_CALL(*transport, setSupportedVersions(_)); - EXPECT_CALL(*transport, setRoutingCallback(_)); - EXPECT_CALL(*transport, setOriginalPeerAddress(_)); - EXPECT_CALL(*transport, setTransportStatsCallback(_)); - EXPECT_CALL(*transport, setServerConnectionIdParams(_)) - .WillOnce(Invoke([&](ServerConnectionIdParams params) { - EXPECT_EQ(params.processId, 0); - EXPECT_EQ(params.workerId, 0); - })); - EXPECT_CALL(*transport, onNetworkData(_, _)) - .WillOnce( - Invoke([&, expected = data.get()](auto, const auto& networkData) { - EXPECT_GT(networkData.packets.size(), 0); - EXPECT_TRUE( - folly::IOBufEqualTo()(*networkData.packets[0], *expected)); - baton.post(); + auto makeTransport = + [&](folly::EventBase* eventBase, + std::unique_ptr& socket, + const folly::SocketAddress&, + std::shared_ptr + ctx) noexcept { + transport = std::make_shared( + eventBase, std::move(socket), cb, ctx); + transport->setClientConnectionId(clientConnId); + // setup expectations + EXPECT_CALL(*transport, getEventBase()) + .WillRepeatedly(Return(eventBase)); + EXPECT_CALL(*transport, setTransportSettings(_)); + EXPECT_CALL(*transport, accept()); + EXPECT_CALL(*transport, setSupportedVersions(_)); + EXPECT_CALL(*transport, setRoutingCallback(_)); + EXPECT_CALL(*transport, setOriginalPeerAddress(_)); + EXPECT_CALL(*transport, setTransportStatsCallback(_)); + EXPECT_CALL(*transport, setServerConnectionIdParams(_)) + .WillOnce(Invoke([&](ServerConnectionIdParams params) { + EXPECT_EQ(params.processId, 0); + EXPECT_EQ(params.workerId, 0); })); - return transport; - }; + EXPECT_CALL(*transport, onNetworkData(_, _)) + .WillOnce(Invoke( + [&, expected = data.get()](auto, const auto& networkData) { + EXPECT_GT(networkData.packets.size(), 0); + EXPECT_TRUE(folly::IOBufEqualTo()( + *networkData.packets[0], *expected)); + baton.post(); + })); + return transport; + }; EXPECT_CALL(*factory, _make(_, _, _, _)).WillOnce(Invoke(makeTransport)); return transport; } @@ -2629,30 +2636,31 @@ TEST_F(QuicServerTest, ZeroRttPacketRoute) { clientConnId, serverConnId, id, *buf, QuicVersion::MVFST); auto data = std::move(packet); - auto makeTransport = [&]( - folly::EventBase * eventBase, - std::unique_ptr & socket, - const folly::SocketAddress&, - std::shared_ptr ctx) noexcept { - transport = std::make_shared( - eventBase, std::move(socket), cb, ctx); - EXPECT_CALL(*transport, getEventBase()).WillRepeatedly(Return(eventBase)); - EXPECT_CALL(*transport, setSupportedVersions(_)); - EXPECT_CALL(*transport, setOriginalPeerAddress(_)); - EXPECT_CALL(*transport, setTransportSettings(_)); - EXPECT_CALL(*transport, setServerConnectionIdParams(_)); - EXPECT_CALL(*transport, accept()); - // post baton upon receiving the data - EXPECT_CALL(*transport, onNetworkData(_, _)) - .WillOnce( - Invoke([&, expected = data.get()](auto, const auto& networkData) { - EXPECT_GT(networkData.packets.size(), 0); - EXPECT_TRUE( - folly::IOBufEqualTo()(*networkData.packets[0], *expected)); - b.post(); - })); - return transport; - }; + auto makeTransport = + [&](folly::EventBase* eventBase, + std::unique_ptr& socket, + const folly::SocketAddress&, + std::shared_ptr ctx) noexcept { + transport = std::make_shared( + eventBase, std::move(socket), cb, ctx); + EXPECT_CALL(*transport, getEventBase()) + .WillRepeatedly(Return(eventBase)); + EXPECT_CALL(*transport, setSupportedVersions(_)); + EXPECT_CALL(*transport, setOriginalPeerAddress(_)); + EXPECT_CALL(*transport, setTransportSettings(_)); + EXPECT_CALL(*transport, setServerConnectionIdParams(_)); + EXPECT_CALL(*transport, accept()); + // post baton upon receiving the data + EXPECT_CALL(*transport, onNetworkData(_, _)) + .WillOnce(Invoke( + [&, expected = data.get()](auto, const auto& networkData) { + EXPECT_GT(networkData.packets.size(), 0); + EXPECT_TRUE(folly::IOBufEqualTo()( + *networkData.packets[0], *expected)); + b.post(); + })); + return transport; + }; EXPECT_CALL(*factory_, _make(_, _, _, _)).WillOnce(Invoke(makeTransport)); auto serverAddr = server_->getAddress(); @@ -2687,9 +2695,8 @@ TEST_F(QuicServerTest, ZeroRttPacketRoute) { std::make_pair(LongHeader::Types::ZeroRtt, QuicVersion::MVFST))); data = std::move(packet); folly::Baton<> b1; - auto verifyZeroRtt = [&]( - const folly::SocketAddress& peer, - const NetworkData& networkData) noexcept { + auto verifyZeroRtt = [&](const folly::SocketAddress& peer, + const NetworkData& networkData) noexcept { EXPECT_GT(networkData.packets.size(), 0); EXPECT_EQ(peer, reader->getSocket().address()); EXPECT_TRUE(folly::IOBufEqualTo()(*data, *networkData.packets[0])); diff --git a/quic/server/test/QuicServerTransportTest.cpp b/quic/server/test/QuicServerTransportTest.cpp index 9631c82e7..0d6411945 100644 --- a/quic/server/test/QuicServerTransportTest.cpp +++ b/quic/server/test/QuicServerTransportTest.cpp @@ -3735,10 +3735,11 @@ TEST_F( std::vector indices = getQLogEventIndices(QLogEventType::TransportStateUpdate, qLogger); EXPECT_EQ(indices.size(), 4); - std::array<::std::string, 4> updateArray = {kDerivedZeroRttReadCipher, - kDerivedOneRttWriteCipher, - kTransportReady, - kDerivedOneRttReadCipher}; + std::array<::std::string, 4> updateArray = { + kDerivedZeroRttReadCipher, + kDerivedOneRttWriteCipher, + kTransportReady, + kDerivedOneRttReadCipher}; for (int i = 0; i < 4; ++i) { auto tmp = std::move(qLogger->logs[indices[i]]); auto event = dynamic_cast(tmp.get()); diff --git a/quic/state/PacketEvent.cpp b/quic/state/PacketEvent.cpp index 97d82a970..8e6474bc4 100644 --- a/quic/state/PacketEvent.cpp +++ b/quic/state/PacketEvent.cpp @@ -7,6 +7,7 @@ */ #include + #include #include @@ -25,8 +26,8 @@ bool operator==(const PacketEvent& lhs, const PacketEvent& rhs) { lhs.packetNumber == rhs.packetNumber; } -size_t PacketEventHash::operator()(const PacketEvent& packetEvent) const - noexcept { +size_t PacketEventHash::operator()( + const PacketEvent& packetEvent) const noexcept { return folly::hash::hash_combine( static_cast>( packetEvent.packetNumberSpace), diff --git a/quic/state/PendingPathRateLimiter.cpp b/quic/state/PendingPathRateLimiter.cpp index 8ffc0e075..6c063bf6f 100644 --- a/quic/state/PendingPathRateLimiter.cpp +++ b/quic/state/PendingPathRateLimiter.cpp @@ -1,6 +1,7 @@ // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved #include + #include namespace quic { diff --git a/quic/state/QPRFunctions.cpp b/quic/state/QPRFunctions.cpp index e472dc253..acaae4b71 100644 --- a/quic/state/QPRFunctions.cpp +++ b/quic/state/QPRFunctions.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/state/QuicStreamFunctions.cpp b/quic/state/QuicStreamFunctions.cpp index 62db1a9d5..2b82b7af5 100644 --- a/quic/state/QuicStreamFunctions.cpp +++ b/quic/state/QuicStreamFunctions.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/state/StateData.cpp b/quic/state/StateData.cpp index e1537b91d..76df77403 100644 --- a/quic/state/StateData.cpp +++ b/quic/state/StateData.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { @@ -17,20 +18,20 @@ QuicStreamState::QuicStreamState(StreamId idIn, QuicConnectionStateBase& connIn) flowControlState.windowSize = isUnidirectionalStream(idIn) ? conn.transportSettings.advertisedInitialUniStreamWindowSize : isLocalStream(connIn.nodeType, idIn) - ? conn.transportSettings.advertisedInitialBidiLocalStreamWindowSize - : conn.transportSettings.advertisedInitialBidiRemoteStreamWindowSize; + ? conn.transportSettings.advertisedInitialBidiLocalStreamWindowSize + : conn.transportSettings.advertisedInitialBidiRemoteStreamWindowSize; flowControlState.advertisedMaxOffset = isUnidirectionalStream(idIn) ? conn.transportSettings.advertisedInitialUniStreamWindowSize : isLocalStream(connIn.nodeType, idIn) - ? conn.transportSettings.advertisedInitialBidiLocalStreamWindowSize - : conn.transportSettings.advertisedInitialBidiRemoteStreamWindowSize; + ? conn.transportSettings.advertisedInitialBidiLocalStreamWindowSize + : conn.transportSettings.advertisedInitialBidiRemoteStreamWindowSize; // Note: this will set a peerAdvertisedMaxOffset for a peer-initiated // unidirectional stream even though that value is meaningless. flowControlState.peerAdvertisedMaxOffset = isUnidirectionalStream(idIn) ? conn.flowControlState.peerAdvertisedInitialMaxStreamOffsetUni : isLocalStream(connIn.nodeType, idIn) - ? conn.flowControlState.peerAdvertisedInitialMaxStreamOffsetBidiRemote - : conn.flowControlState.peerAdvertisedInitialMaxStreamOffsetBidiLocal; + ? conn.flowControlState.peerAdvertisedInitialMaxStreamOffsetBidiRemote + : conn.flowControlState.peerAdvertisedInitialMaxStreamOffsetBidiLocal; if (isUnidirectionalStream(idIn)) { if (isLocalStream(connIn.nodeType, idIn)) { recvState = StreamRecvState::Invalid; diff --git a/quic/state/stream/StreamSendHandlers.cpp b/quic/state/stream/StreamSendHandlers.cpp index e8e077541..38a52b79a 100644 --- a/quic/state/stream/StreamSendHandlers.cpp +++ b/quic/state/stream/StreamSendHandlers.cpp @@ -1,6 +1,7 @@ // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved #include + #include #include diff --git a/quic/state/stream/StreamStateFunctions.cpp b/quic/state/stream/StreamStateFunctions.cpp index 489a8730c..83d4093e8 100644 --- a/quic/state/stream/StreamStateFunctions.cpp +++ b/quic/state/stream/StreamStateFunctions.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/state/stream/test/StreamStateFunctionsTest.cpp b/quic/state/stream/test/StreamStateFunctionsTest.cpp index b519841a1..292957159 100644 --- a/quic/state/stream/test/StreamStateFunctionsTest.cpp +++ b/quic/state/stream/test/StreamStateFunctionsTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include #include diff --git a/quic/state/test/PacketEventTest.cpp b/quic/state/test/PacketEventTest.cpp index 02ab88895..500add95b 100644 --- a/quic/state/test/PacketEventTest.cpp +++ b/quic/state/test/PacketEventTest.cpp @@ -7,6 +7,7 @@ */ #include + #include namespace quic { diff --git a/quic/tools/tperf/test/PacingObserverTest.cpp b/quic/tools/tperf/test/PacingObserverTest.cpp index e7c7ac43b..5c0394471 100644 --- a/quic/tools/tperf/test/PacingObserverTest.cpp +++ b/quic/tools/tperf/test/PacingObserverTest.cpp @@ -7,6 +7,7 @@ */ #include + #include #include diff --git a/quic/tools/tperf/tperf.cpp b/quic/tools/tperf/tperf.cpp index da674187a..d945d01b6 100644 --- a/quic/tools/tperf/tperf.cpp +++ b/quic/tools/tperf/tperf.cpp @@ -307,9 +307,8 @@ class ServerStreamHandler : public quic::QuicSocket::ConnectionCallback, // resetStream } - void onStreamWriteReady( - quic::StreamId id, - uint64_t maxToSend) noexcept override { + void onStreamWriteReady(quic::StreamId id, uint64_t maxToSend) noexcept + override { bool eof = false; uint64_t toSend = maxToSend; if (maxBytesPerStream_ > 0) { @@ -375,8 +374,8 @@ class TPerfServerTransportFactory : public quic::QuicServerTransportFactory { folly::EventBase* evb, std::unique_ptr sock, const folly::SocketAddress&, - std::shared_ptr - ctx) noexcept override { + std::shared_ptr ctx) noexcept + override { CHECK_EQ(evb, sock->getEventBase()); auto serverHandler = std::make_unique( evb, blockSize_, numStreams_, maxBytesPerStream_); @@ -615,9 +614,8 @@ class TPerfClient : public quic::QuicSocket::ConnectionCallback, eventBase_.terminateLoopSoon(); } - void onStreamWriteReady( - quic::StreamId id, - uint64_t maxToSend) noexcept override { + void onStreamWriteReady(quic::StreamId id, uint64_t maxToSend) noexcept + override { LOG(INFO) << "TPerfClient stream" << id << " is write ready with maxToSend=" << maxToSend; } @@ -670,9 +668,10 @@ class TPerfClient : public quic::QuicSocket::ConnectionCallback, settings.d6dConfig.advertisedProbeTimeout = std::chrono::seconds(FLAGS_d6d_probe_timeout_secs); if (!FLAGS_transport_knob_params.empty()) { - settings.knobs.push_back({kDefaultQuicTransportKnobSpace, - kDefaultQuicTransportKnobId, - FLAGS_transport_knob_params}); + settings.knobs.push_back( + {kDefaultQuicTransportKnobSpace, + kDefaultQuicTransportKnobId, + FLAGS_transport_knob_params}); } quicClient_->setTransportSettings(settings); @@ -692,9 +691,10 @@ class TPerfClient : public quic::QuicSocket::ConnectionCallback, uint64_t receivedBytes_{0}; uint64_t receivedStreams_{0}; std::map bytesPerStream_; - folly::Histogram bytesPerStreamHistogram_{1024, - 0, - 1024 * 1024 * 1024}; + folly::Histogram bytesPerStreamHistogram_{ + 1024, + 0, + 1024 * 1024 * 1024}; std::chrono::seconds duration_; uint64_t window_; bool gso_;