mirror of
https://github.com/facebookincubator/mvfst.git
synced 2025-08-06 22:22:38 +03:00
Use QuicInplacePacketBuilder for write path
Summary: as title Reviewed By: mjoras Differential Revision: D21211415 fbshipit-source-id: 15814f951adca2eb4ded8228e2d291a9c1514011
This commit is contained in:
Yang Chi
committed by
Facebook GitHub Bot
Facebook GitHub Bot
parent
332a26b85c
commit
7bfeec366a
@@ -2221,5 +2221,258 @@ TEST_F(QuicTransportFunctionsTest, ProbeWriteNewFunctionalFrames) {
|
||||
conn->outstandingPackets[1].packet.frames[0].type());
|
||||
}
|
||||
|
||||
TEST_F(QuicTransportFunctionsTest, WriteWithInplaceBuilder) {
|
||||
auto conn = createConn();
|
||||
conn->transportSettings.dataPathType = DataPathType::ContinuousMemory;
|
||||
auto simpleBufAccessor =
|
||||
std::make_unique<SimpleBufAccessor>(conn->udpSendPacketLen * 16);
|
||||
auto outputBuf = simpleBufAccessor->obtain();
|
||||
auto bufPtr = outputBuf.get();
|
||||
simpleBufAccessor->release(std::move(outputBuf));
|
||||
conn->bufAccessor = simpleBufAccessor.get();
|
||||
conn->transportSettings.batchingMode = QuicBatchingMode::BATCHING_MODE_GSO;
|
||||
EventBase evb;
|
||||
folly::test::MockAsyncUDPSocket mockSock(&evb);
|
||||
EXPECT_CALL(mockSock, getGSO()).WillRepeatedly(Return(true));
|
||||
auto stream = conn->streamManager->createNextBidirectionalStream().value();
|
||||
auto buf = folly::IOBuf::copyBuffer("Andante in C minor");
|
||||
writeDataToQuicStream(*stream, buf->clone(), true);
|
||||
EXPECT_CALL(mockSock, write(_, _))
|
||||
.Times(1)
|
||||
.WillOnce(Invoke([&](const SocketAddress&,
|
||||
const std::unique_ptr<folly::IOBuf>& sockBuf) {
|
||||
EXPECT_GT(bufPtr->length(), 0);
|
||||
EXPECT_GE(sockBuf->length(), buf->length());
|
||||
EXPECT_EQ(sockBuf.get(), bufPtr);
|
||||
EXPECT_TRUE(folly::IOBufEqualTo()(*sockBuf, *bufPtr));
|
||||
EXPECT_FALSE(sockBuf->isChained());
|
||||
return sockBuf->computeChainDataLength();
|
||||
}));
|
||||
writeQuicDataToSocket(
|
||||
mockSock,
|
||||
*conn,
|
||||
*conn->clientConnectionId,
|
||||
*conn->serverConnectionId,
|
||||
*aead,
|
||||
*headerCipher,
|
||||
getVersion(*conn),
|
||||
conn->transportSettings.writeConnectionDataPacketsLimit);
|
||||
EXPECT_EQ(0, bufPtr->length());
|
||||
EXPECT_EQ(0, bufPtr->headroom());
|
||||
}
|
||||
|
||||
TEST_F(QuicTransportFunctionsTest, WriteWithInplaceBuilderRollbackBuf) {
|
||||
auto conn = createConn();
|
||||
conn->transportSettings.dataPathType = DataPathType::ContinuousMemory;
|
||||
auto simpleBufAccessor =
|
||||
std::make_unique<SimpleBufAccessor>(conn->udpSendPacketLen * 16);
|
||||
auto outputBuf = simpleBufAccessor->obtain();
|
||||
auto bufPtr = outputBuf.get();
|
||||
simpleBufAccessor->release(std::move(outputBuf));
|
||||
conn->bufAccessor = simpleBufAccessor.get();
|
||||
conn->transportSettings.batchingMode = QuicBatchingMode::BATCHING_MODE_GSO;
|
||||
EventBase evb;
|
||||
folly::test::MockAsyncUDPSocket mockSock(&evb);
|
||||
EXPECT_CALL(mockSock, getGSO()).WillRepeatedly(Return(true));
|
||||
EXPECT_CALL(mockSock, write(_, _)).Times(0);
|
||||
writeQuicDataToSocket(
|
||||
mockSock,
|
||||
*conn,
|
||||
*conn->clientConnectionId,
|
||||
*conn->serverConnectionId,
|
||||
*aead,
|
||||
*headerCipher,
|
||||
getVersion(*conn),
|
||||
conn->transportSettings.writeConnectionDataPacketsLimit);
|
||||
EXPECT_EQ(0, bufPtr->length());
|
||||
EXPECT_EQ(0, bufPtr->headroom());
|
||||
}
|
||||
|
||||
TEST_F(QuicTransportFunctionsTest, WriteWithInplaceBuilderGSOMultiplePackets) {
|
||||
auto conn = createConn();
|
||||
conn->transportSettings.dataPathType = DataPathType::ContinuousMemory;
|
||||
auto simpleBufAccessor =
|
||||
std::make_unique<SimpleBufAccessor>(conn->udpSendPacketLen * 16);
|
||||
auto outputBuf = simpleBufAccessor->obtain();
|
||||
auto bufPtr = outputBuf.get();
|
||||
simpleBufAccessor->release(std::move(outputBuf));
|
||||
conn->bufAccessor = simpleBufAccessor.get();
|
||||
conn->transportSettings.batchingMode = QuicBatchingMode::BATCHING_MODE_GSO;
|
||||
EventBase evb;
|
||||
folly::test::MockAsyncUDPSocket mockSock(&evb);
|
||||
EXPECT_CALL(mockSock, getGSO()).WillRepeatedly(Return(true));
|
||||
auto stream = conn->streamManager->createNextBidirectionalStream().value();
|
||||
auto buf = buildRandomInputData(conn->udpSendPacketLen * 10);
|
||||
writeDataToQuicStream(*stream, buf->clone(), true);
|
||||
EXPECT_CALL(mockSock, writeGSO(_, _, _))
|
||||
.Times(1)
|
||||
.WillOnce(Invoke([&](const folly::SocketAddress&,
|
||||
const std::unique_ptr<folly::IOBuf>& sockBuf,
|
||||
int gso) {
|
||||
EXPECT_LE(gso, conn->udpSendPacketLen);
|
||||
EXPECT_GT(bufPtr->length(), 0);
|
||||
EXPECT_EQ(sockBuf.get(), bufPtr);
|
||||
EXPECT_TRUE(folly::IOBufEqualTo()(*sockBuf, *bufPtr));
|
||||
EXPECT_FALSE(sockBuf->isChained());
|
||||
return sockBuf->length();
|
||||
}));
|
||||
writeQuicDataToSocket(
|
||||
mockSock,
|
||||
*conn,
|
||||
*conn->clientConnectionId,
|
||||
*conn->serverConnectionId,
|
||||
*aead,
|
||||
*headerCipher,
|
||||
getVersion(*conn),
|
||||
conn->transportSettings.writeConnectionDataPacketsLimit);
|
||||
EXPECT_EQ(0, bufPtr->length());
|
||||
EXPECT_EQ(0, bufPtr->headroom());
|
||||
}
|
||||
|
||||
TEST_F(QuicTransportFunctionsTest, WriteProbingWithInplaceBuilder) {
|
||||
auto conn = createConn();
|
||||
conn->transportSettings.dataPathType = DataPathType::ContinuousMemory;
|
||||
conn->transportSettings.batchingMode = QuicBatchingMode::BATCHING_MODE_GSO;
|
||||
EventBase evb;
|
||||
folly::test::MockAsyncUDPSocket mockSock(&evb);
|
||||
EXPECT_CALL(mockSock, getGSO()).WillRepeatedly(Return(true));
|
||||
|
||||
SimpleBufAccessor bufAccessor(
|
||||
conn->udpSendPacketLen * conn->transportSettings.maxBatchSize);
|
||||
conn->bufAccessor = &bufAccessor;
|
||||
auto buf = bufAccessor.obtain();
|
||||
auto bufPtr = buf.get();
|
||||
bufAccessor.release(std::move(buf));
|
||||
|
||||
auto stream = conn->streamManager->createNextBidirectionalStream().value();
|
||||
auto inputBuf = buildRandomInputData(
|
||||
conn->udpSendPacketLen *
|
||||
conn->transportSettings.writeConnectionDataPacketsLimit);
|
||||
writeDataToQuicStream(*stream, inputBuf->clone(), true);
|
||||
EXPECT_CALL(mockSock, writeGSO(_, _, _))
|
||||
.Times(1)
|
||||
.WillOnce(Invoke([&](const folly::SocketAddress&,
|
||||
const std::unique_ptr<folly::IOBuf>& sockBuf,
|
||||
int gso) {
|
||||
EXPECT_LE(gso, conn->udpSendPacketLen);
|
||||
EXPECT_GE(
|
||||
bufPtr->length(),
|
||||
conn->udpSendPacketLen *
|
||||
conn->transportSettings.writeConnectionDataPacketsLimit);
|
||||
EXPECT_EQ(sockBuf.get(), bufPtr);
|
||||
EXPECT_TRUE(folly::IOBufEqualTo()(*sockBuf, *bufPtr));
|
||||
EXPECT_FALSE(sockBuf->isChained());
|
||||
return sockBuf->length();
|
||||
}));
|
||||
writeQuicDataToSocket(
|
||||
mockSock,
|
||||
*conn,
|
||||
*conn->clientConnectionId,
|
||||
*conn->serverConnectionId,
|
||||
*aead,
|
||||
*headerCipher,
|
||||
getVersion(*conn),
|
||||
conn->transportSettings.writeConnectionDataPacketsLimit + 1);
|
||||
ASSERT_EQ(0, bufPtr->length());
|
||||
ASSERT_EQ(0, bufPtr->headroom());
|
||||
EXPECT_GE(conn->outstandingPackets.size(), 5);
|
||||
// Make sure there no more new data to write:
|
||||
StreamFrameScheduler streamScheduler(*conn);
|
||||
ASSERT_FALSE(streamScheduler.hasPendingData());
|
||||
|
||||
// The last packet may not be a full packet
|
||||
auto lastPacketSize = conn->outstandingPackets.back().encodedSize;
|
||||
size_t expectedOutstandingPacketsCount = 5;
|
||||
if (lastPacketSize < conn->udpSendPacketLen) {
|
||||
expectedOutstandingPacketsCount++;
|
||||
}
|
||||
EXPECT_CALL(mockSock, write(_, _))
|
||||
.Times(1)
|
||||
.WillOnce(Invoke([&](const folly::SocketAddress&,
|
||||
const std::unique_ptr<folly::IOBuf>& buf) {
|
||||
EXPECT_FALSE(buf->isChained());
|
||||
// If the last packet isn't full, it may have the stream length field
|
||||
// but the clone won't have it.
|
||||
EXPECT_LE(buf->length(), lastPacketSize);
|
||||
return buf->length();
|
||||
}));
|
||||
writeProbingDataToSocketForTest(
|
||||
mockSock,
|
||||
*conn,
|
||||
1 /* probesToSend */,
|
||||
*aead,
|
||||
*headerCipher,
|
||||
getVersion(*conn));
|
||||
EXPECT_EQ(
|
||||
conn->outstandingPackets.size(), expectedOutstandingPacketsCount + 1);
|
||||
EXPECT_EQ(0, bufPtr->length());
|
||||
EXPECT_EQ(0, bufPtr->headroom());
|
||||
|
||||
// Clone again, this time 2 pacckets.
|
||||
if (lastPacketSize < conn->udpSendPacketLen) {
|
||||
EXPECT_CALL(mockSock, writeGSO(_, _, _))
|
||||
.Times(1)
|
||||
.WillOnce(Invoke([&](const folly::SocketAddress&,
|
||||
const std::unique_ptr<folly::IOBuf>& buf,
|
||||
int gso) {
|
||||
EXPECT_FALSE(buf->isChained());
|
||||
EXPECT_LE(gso, lastPacketSize);
|
||||
EXPECT_LE(buf->length(), lastPacketSize * 2);
|
||||
return buf->length();
|
||||
}));
|
||||
} else {
|
||||
EXPECT_CALL(mockSock, writeGSO(_, _, _))
|
||||
.Times(1)
|
||||
.WillOnce(Invoke([&](const folly::SocketAddress&,
|
||||
const std::unique_ptr<folly::IOBuf>& buf,
|
||||
int gso) {
|
||||
EXPECT_FALSE(buf->isChained());
|
||||
EXPECT_EQ(conn->udpSendPacketLen, gso);
|
||||
EXPECT_EQ(buf->length(), conn->udpSendPacketLen * 4);
|
||||
return buf->length();
|
||||
}));
|
||||
}
|
||||
writeProbingDataToSocketForTest(
|
||||
mockSock,
|
||||
*conn,
|
||||
2 /* probesToSend */,
|
||||
*aead,
|
||||
*headerCipher,
|
||||
getVersion(*conn));
|
||||
EXPECT_EQ(0, bufPtr->length());
|
||||
EXPECT_EQ(0, bufPtr->headroom());
|
||||
EXPECT_EQ(
|
||||
conn->outstandingPackets.size(), expectedOutstandingPacketsCount + 3);
|
||||
|
||||
// Clear out all the small packets:
|
||||
while (conn->outstandingPackets.back().encodedSize < conn->udpSendPacketLen) {
|
||||
conn->outstandingPackets.pop_back();
|
||||
}
|
||||
ASSERT_FALSE(conn->outstandingPackets.empty());
|
||||
auto currentOutstandingPackets = conn->outstandingPackets.size();
|
||||
|
||||
// Clone 2 full size packets
|
||||
EXPECT_CALL(mockSock, writeGSO(_, _, _))
|
||||
.Times(1)
|
||||
.WillOnce(Invoke([&](const folly::SocketAddress&,
|
||||
const std::unique_ptr<folly::IOBuf>& buf,
|
||||
int gso) {
|
||||
EXPECT_FALSE(buf->isChained());
|
||||
EXPECT_EQ(conn->udpSendPacketLen, gso);
|
||||
EXPECT_EQ(buf->length(), conn->udpSendPacketLen * 2);
|
||||
return buf->length();
|
||||
}));
|
||||
writeProbingDataToSocketForTest(
|
||||
mockSock,
|
||||
*conn,
|
||||
2 /* probesToSend */,
|
||||
*aead,
|
||||
*headerCipher,
|
||||
getVersion(*conn));
|
||||
EXPECT_EQ(conn->outstandingPackets.size(), currentOutstandingPackets + 2);
|
||||
EXPECT_EQ(0, bufPtr->length());
|
||||
EXPECT_EQ(0, bufPtr->headroom());
|
||||
}
|
||||
|
||||
} // namespace test
|
||||
} // namespace quic
|
||||
|
||||
Reference in New Issue
Block a user