lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-11-24 04:01:07 +03:00
Code Activity

migrate from FOLLY_MAYBE_UNUSED to [[maybe_unused]]

Browse Source 
Reviewed By: ot, Orvid, xinchenguo

Differential Revision: D54089810

fbshipit-source-id: c88eb520404590c9759e0e29966d1399c26a2244
This commit is contained in:
Yedidya Feldblum
2024-02-28 13:28:26 -08:00
committed by Facebook GitHub Bot
parent d842e7267b
commit f8ccdde463
8 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
quic/api/QuicTransportBase.cpp
View File

@@ -200,7 +200,7 @@ bool QuicTransportBase::error() const {
} }
void QuicTransportBase::close(folly::Optional<QuicError> errorCode) { void QuicTransportBase::close(folly::Optional<QuicError> errorCode) {
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
// The caller probably doesn't need a conn callback any more because they // The caller probably doesn't need a conn callback any more because they
// explicitly called close. // explicitly called close.
resetConnectionCallbacks(); resetConnectionCallbacks();
@@ -213,7 +213,7 @@ void QuicTransportBase::close(folly::Optional<QuicError> errorCode) {
void QuicTransportBase::closeNow(folly::Optional<QuicError> errorCode) { void QuicTransportBase::closeNow(folly::Optional<QuicError> errorCode) {
DCHECK(getEventBase() && getEventBase()->isInEventBaseThread()); DCHECK(getEventBase() && getEventBase()->isInEventBaseThread());
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
VLOG(4) << __func__ << " " << *this; VLOG(4) << __func__ << " " << *this;
errorCode = maybeSetGenericAppError(std::move(errorCode)); errorCode = maybeSetGenericAppError(std::move(errorCode));
closeImpl(std::move(errorCode), false); closeImpl(std::move(errorCode), false);
@@ -231,7 +231,7 @@ void QuicTransportBase::closeGracefully() {
closeState_ == CloseState::GRACEFUL_CLOSING) { closeState_ == CloseState::GRACEFUL_CLOSING) {
return; return;
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
resetConnectionCallbacks(); resetConnectionCallbacks();
closeState_ = CloseState::GRACEFUL_CLOSING; closeState_ = CloseState::GRACEFUL_CLOSING;
updatePacingOnClose(*conn_); updatePacingOnClose(*conn_);
@@ -1274,7 +1274,7 @@ folly::Expected<std::pair<Buf, bool>, LocalErrorCode> QuicTransportBase::read(
if (closeState_ != CloseState::OPEN) { if (closeState_ != CloseState::OPEN) {
return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED); return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED);
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
SCOPE_EXIT { SCOPE_EXIT {
updateReadLooper(); updateReadLooper();
updatePeekLooper(); // read can affect "peek" API updatePeekLooper(); // read can affect "peek" API
@@ -1327,7 +1327,7 @@ folly::Expected<folly::Unit, LocalErrorCode> QuicTransportBase::peek(
if (closeState_ != CloseState::OPEN) { if (closeState_ != CloseState::OPEN) {
return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED); return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED);
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
SCOPE_EXIT { SCOPE_EXIT {
updatePeekLooper(); updatePeekLooper();
updateWriteLooper(true); updateWriteLooper(true);
@@ -1374,7 +1374,7 @@ folly::
return folly::makeUnexpected( return folly::makeUnexpected(
ConsumeError{LocalErrorCode::CONNECTION_CLOSED, folly::none}); ConsumeError{LocalErrorCode::CONNECTION_CLOSED, folly::none});
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
SCOPE_EXIT { SCOPE_EXIT {
updatePeekLooper(); updatePeekLooper();
updateReadLooper(); // consume may affect "read" API updateReadLooper(); // consume may affect "read" API
@@ -1854,7 +1854,7 @@ void QuicTransportBase::processCallbacksAfterNetworkData() {
void QuicTransportBase::onNetworkData( void QuicTransportBase::onNetworkData(
const folly::SocketAddress& peer, const folly::SocketAddress& peer,
NetworkData&& networkData) noexcept { NetworkData&& networkData) noexcept {
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
SCOPE_EXIT { SCOPE_EXIT {
checkForClosedStream(); checkForClosedStream();
updateReadLooper(); updateReadLooper();
@@ -2218,7 +2218,7 @@ QuicSocket::WriteResult QuicTransportBase::writeChain(
if (closeState_ != CloseState::OPEN) { if (closeState_ != CloseState::OPEN) {
return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED); return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED);
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
try { try {
// Check whether stream exists before calling getStream to avoid // Check whether stream exists before calling getStream to avoid
// creating a peer stream if it does not exist yet. // creating a peer stream if it does not exist yet.
@@ -2287,7 +2287,7 @@ QuicSocket::WriteResult QuicTransportBase::writeBufMeta(
if (closeState_ != CloseState::OPEN) { if (closeState_ != CloseState::OPEN) {
return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED); return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED);
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
try { try {
// Check whether stream exists before calling getStream to avoid // Check whether stream exists before calling getStream to avoid
// creating a peer stream if it does not exist yet. // creating a peer stream if it does not exist yet.
@@ -2380,7 +2380,7 @@ QuicTransportBase::registerByteEventCallback(
if (closeState_ != CloseState::OPEN) { if (closeState_ != CloseState::OPEN) {
return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED); return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED);
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
if (!conn_->streamManager->streamExists(id)) { if (!conn_->streamManager->streamExists(id)) {
return folly::makeUnexpected(LocalErrorCode::STREAM_NOT_EXISTS); return folly::makeUnexpected(LocalErrorCode::STREAM_NOT_EXISTS);
} }
@@ -2488,7 +2488,7 @@ folly::Expected<folly::Unit, LocalErrorCode> QuicTransportBase::resetStream(
if (closeState_ != CloseState::OPEN) { if (closeState_ != CloseState::OPEN) {
return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED); return folly::makeUnexpected(LocalErrorCode::CONNECTION_CLOSED);
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
SCOPE_EXIT { SCOPE_EXIT {
checkForClosedStream(); checkForClosedStream();
updateReadLooper(); updateReadLooper();
@@ -2650,7 +2650,7 @@ void QuicTransportBase::sendPing(std::chrono::milliseconds pingTimeout) {
void QuicTransportBase::lossTimeoutExpired() noexcept { void QuicTransportBase::lossTimeoutExpired() noexcept {
CHECK_NE(closeState_, CloseState::CLOSED); CHECK_NE(closeState_, CloseState::CLOSED);
// onLossDetectionAlarm will set packetToSend in pending events // onLossDetectionAlarm will set packetToSend in pending events
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
try { try {
onLossDetectionAlarm(*conn_, markPacketLoss); onLossDetectionAlarm(*conn_, markPacketLoss);
if (conn_->qLogger) { if (conn_->qLogger) {
@@ -2681,7 +2681,7 @@ void QuicTransportBase::lossTimeoutExpired() noexcept {
void QuicTransportBase::ackTimeoutExpired() noexcept { void QuicTransportBase::ackTimeoutExpired() noexcept {
CHECK_NE(closeState_, CloseState::CLOSED); CHECK_NE(closeState_, CloseState::CLOSED);
VLOG(10) << __func__ << " " << *this; VLOG(10) << __func__ << " " << *this;
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
updateAckStateOnAckTimeout(*conn_); updateAckStateOnAckTimeout(*conn_);
pacedWriteDataToSocket(); pacedWriteDataToSocket();
} }
@@ -2704,7 +2704,7 @@ void QuicTransportBase::pathValidationTimeoutExpired() noexcept {
// TODO junqiw probing is not supported, so pathValidation==connMigration // TODO junqiw probing is not supported, so pathValidation==connMigration
// We decide to close conn when pathValidation to migrated path fails. // We decide to close conn when pathValidation to migrated path fails.
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
closeImpl(QuicError( closeImpl(QuicError(
QuicErrorCode(TransportErrorCode::INVALID_MIGRATION), QuicErrorCode(TransportErrorCode::INVALID_MIGRATION),
std::string("Path validation timed out"))); std::string("Path validation timed out")));
@@ -2712,7 +2712,7 @@ void QuicTransportBase::pathValidationTimeoutExpired() noexcept {
void QuicTransportBase::idleTimeoutExpired(bool drain) noexcept { void QuicTransportBase::idleTimeoutExpired(bool drain) noexcept {
VLOG(4) << __func__ << " " << *this; VLOG(4) << __func__ << " " << *this;
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
// idle timeout is expired, just close the connection and drain or // idle timeout is expired, just close the connection and drain or
// send connection close immediately depending on 'drain' // send connection close immediately depending on 'drain'
DCHECK_NE(closeState_, CloseState::CLOSED); DCHECK_NE(closeState_, CloseState::CLOSED);
@@ -2731,7 +2731,7 @@ void QuicTransportBase::idleTimeoutExpired(bool drain) noexcept {
} }
void QuicTransportBase::keepaliveTimeoutExpired() noexcept { void QuicTransportBase::keepaliveTimeoutExpired() noexcept {
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
conn_->pendingEvents.sendPing = true; conn_->pendingEvents.sendPing = true;
updateWriteLooper(true); updateWriteLooper(true);
} }
@@ -3191,7 +3191,7 @@ void QuicTransportBase::writeSocketData() {
} }
void QuicTransportBase::writeSocketDataAndCatch() { void QuicTransportBase::writeSocketDataAndCatch() {
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
try { try {
writeSocketData(); writeSocketData();
processCallbacksAfterWriteData(); processCallbacksAfterWriteData();
@@ -3533,7 +3533,7 @@ void QuicTransportBase::runOnEvbAsync(
} }
void QuicTransportBase::pacedWriteDataToSocket() { void QuicTransportBase::pacedWriteDataToSocket() {
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
if (!isConnectionPaced(*conn_)) { if (!isConnectionPaced(*conn_)) {
// Not paced and connection is still open, normal write. Even if pacing is // Not paced and connection is still open, normal write. Even if pacing is
@@ -3654,7 +3654,7 @@ QuicSocket::WriteResult QuicTransportBase::setDSRPacketizationRequestSender(
if (isReceivingStream(conn_->nodeType, id)) { if (isReceivingStream(conn_->nodeType, id)) {
return folly::makeUnexpected(LocalErrorCode::INVALID_OPERATION); return folly::makeUnexpected(LocalErrorCode::INVALID_OPERATION);
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
try { try {
// Check whether stream exists before calling getStream to avoid // Check whether stream exists before calling getStream to avoid
// creating a peer stream if it does not exist yet. // creating a peer stream if it does not exist yet.

2
quic/client/QuicClientTransport.cpp
View File

@@ -1079,7 +1079,7 @@ bool QuicClientTransport::isTLSResumed() const {
} }
void QuicClientTransport::errMessage( void QuicClientTransport::errMessage(
FOLLY_MAYBE_UNUSED const cmsghdr& cmsg) noexcept { [[maybe_unused]] const cmsghdr& cmsg) noexcept {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE #ifdef FOLLY_HAVE_MSG_ERRQUEUE
if ((cmsg.cmsg_level == SOL_IP && cmsg.cmsg_type == IP_RECVERR) || if ((cmsg.cmsg_level == SOL_IP && cmsg.cmsg_type == IP_RECVERR) ||
(cmsg.cmsg_level == SOL_IPV6 && cmsg.cmsg_type == IPV6_RECVERR)) { (cmsg.cmsg_level == SOL_IPV6 && cmsg.cmsg_type == IPV6_RECVERR)) {

4
quic/common/udpsocket/QuicAsyncUDPSocket.cpp
View File

@@ -23,8 +23,8 @@ T* QuicAsyncUDPSocket::getTypedSocket() const {
} }
void QuicAsyncUDPSocket::fromMsg( void QuicAsyncUDPSocket::fromMsg(
FOLLY_MAYBE_UNUSED ReadCallback::OnDataAvailableParams& params, [[maybe_unused]] ReadCallback::OnDataAvailableParams& params,
FOLLY_MAYBE_UNUSED struct msghdr& msg) { [[maybe_unused]] struct msghdr& msg) {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE #ifdef FOLLY_HAVE_MSG_ERRQUEUE
struct cmsghdr* cmsg; struct cmsghdr* cmsg;
uint16_t* grosizeptr; uint16_t* grosizeptr;

4
quic/common/udpsocket/QuicAsyncUDPSocket.h
View File

@@ -298,7 +298,7 @@ class QuicAsyncUDPSocket {
T* getTypedSocket() const; T* getTypedSocket() const;
static void fromMsg( static void fromMsg(
FOLLY_MAYBE_UNUSED ReadCallback::OnDataAvailableParams& params, [[maybe_unused]] ReadCallback::OnDataAvailableParams& params,
FOLLY_MAYBE_UNUSED struct msghdr& msg); [[maybe_unused]] struct msghdr& msg);
}; };
} // namespace quic } // namespace quic

2
quic/dsr/backend/DSRPacketizer.cpp
View File

@@ -149,7 +149,7 @@ BufQuicBatchResult PacketGroupWriter::writePacketsGroup(
static auto& getThreadLocalConn(size_t maxPackets = 44) { static auto& getThreadLocalConn(size_t maxPackets = 44) {
static thread_local QuicConnectionStateBase fakeConn{QuicNodeType::Server}; static thread_local QuicConnectionStateBase fakeConn{QuicNodeType::Server};
static thread_local bool initAccessor FOLLY_MAYBE_UNUSED = [&]() { static thread_local bool initAccessor [[maybe_unused]] = [&]() {
fakeConn.bufAccessor = fakeConn.bufAccessor =
new SimpleBufAccessor{kDefaultMaxUDPPayload * maxPackets}; new SimpleBufAccessor{kDefaultMaxUDPPayload * maxPackets};
// Store this so we can use it to set the batch writer. // Store this so we can use it to set the batch writer.

18
quic/fizz/client/test/QuicClientTransportTest.cpp
View File

@@ -1649,8 +1649,8 @@ class QuicClientTransportHappyEyeballsTest
} }
void fatalReadErrorOnFirstBeforeSecondStarts( void fatalReadErrorOnFirstBeforeSecondStarts(
FOLLY_MAYBE_UNUSED const SocketAddress& firstAddress, [[maybe_unused]] const SocketAddress& firstAddress,
FOLLY_MAYBE_UNUSED const SocketAddress& secondAddress) { [[maybe_unused]] const SocketAddress& secondAddress) {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE #ifdef FOLLY_HAVE_MSG_ERRQUEUE
auto& conn = client->getConn(); auto& conn = client->getConn();
EXPECT_CALL(*sock, write(firstAddress, _)); EXPECT_CALL(*sock, write(firstAddress, _));
@@ -1766,8 +1766,8 @@ class QuicClientTransportHappyEyeballsTest
} }
void fatalReadErrorOnFirstAfterSecondStarts( void fatalReadErrorOnFirstAfterSecondStarts(
FOLLY_MAYBE_UNUSED const SocketAddress& firstAddress, [[maybe_unused]] const SocketAddress& firstAddress,
FOLLY_MAYBE_UNUSED const SocketAddress& secondAddress) { [[maybe_unused]] const SocketAddress& secondAddress) {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE #ifdef FOLLY_HAVE_MSG_ERRQUEUE
auto& conn = client->getConn(); auto& conn = client->getConn();
@@ -1893,8 +1893,8 @@ class QuicClientTransportHappyEyeballsTest
} }
void fatalReadErrorOnSecondAfterSecondStarts( void fatalReadErrorOnSecondAfterSecondStarts(
FOLLY_MAYBE_UNUSED const SocketAddress& firstAddress, [[maybe_unused]] const SocketAddress& firstAddress,
FOLLY_MAYBE_UNUSED const SocketAddress& secondAddress) { [[maybe_unused]] const SocketAddress& secondAddress) {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE #ifdef FOLLY_HAVE_MSG_ERRQUEUE
auto& conn = client->getConn(); auto& conn = client->getConn();
@@ -2019,8 +2019,8 @@ class QuicClientTransportHappyEyeballsTest
} }
void fatalReadErrorOnBothAfterSecondStarts( void fatalReadErrorOnBothAfterSecondStarts(
FOLLY_MAYBE_UNUSED const SocketAddress& firstAddress, [[maybe_unused]] const SocketAddress& firstAddress,
FOLLY_MAYBE_UNUSED const SocketAddress& secondAddress) { [[maybe_unused]] const SocketAddress& secondAddress) {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE #ifdef FOLLY_HAVE_MSG_ERRQUEUE
auto& conn = client->getConn(); auto& conn = client->getConn();
@@ -2959,7 +2959,7 @@ bool verifyFramePresent(
if (!regularPacket) { if (!regularPacket) {
continue; continue;
} }
for (FOLLY_MAYBE_UNUSED auto& frame : regularPacket->frames) { for ([[maybe_unused]] auto& frame : regularPacket->frames) {
if (frame.type() != frameType) { if (frame.type() != frameType) {
continue; continue;
} }

2
quic/server/QuicServerTransport.cpp
View File

@@ -447,7 +447,7 @@ void QuicServerTransport::onCryptoEventAvailable() noexcept {
VLOG(10) << "Got crypto event after connection closed " << *this; VLOG(10) << "Got crypto event after connection closed " << *this;
return; return;
} }
FOLLY_MAYBE_UNUSED auto self = sharedGuard(); [[maybe_unused]] auto self = sharedGuard();
updateHandshakeState(*serverConn_); updateHandshakeState(*serverConn_);
processPendingData(false); processPendingData(false);
// pending data may contain connection close // pending data may contain connection close

2
quic/server/test/QuicServerTransportTest.cpp
View File

@@ -41,7 +41,7 @@ folly::Optional<QuicFrame> getFrameIfPresent(
if (!regularPacket) { if (!regularPacket) {
continue; continue;
} }
for (FOLLY_MAYBE_UNUSED auto& frame : regularPacket->frames) { for ([[maybe_unused]] auto& frame : regularPacket->frames) {
if (frame.type() != frameType) { if (frame.type() != frameType) {
continue; continue;
} }