mirror of
https://github.com/facebookincubator/mvfst.git
synced 2025-08-06 22:22:38 +03:00
cleanup addWritable
Summary: All the functionality is a duplicated from `updateWritableStreams`. Btw the only callsites were inside UT. Reviewed By: kvtsoy Differential Revision: D68351972 fbshipit-source-id: 7e17f38ffcffecea23a64f5d2d5c1dec7a8c43f5
This commit is contained in:
committed by
Facebook GitHub Bot
parent
9a46de20a4
commit
d0c124fe15
@@ -4829,7 +4829,6 @@ TEST_P(
|
||||
stream->writeBuffer.append(std::move(dataBuf));
|
||||
|
||||
// Insert streamId into the list.
|
||||
conn->streamManager->addWritable(*stream);
|
||||
conn->streamManager->updateWritableStreams(*stream);
|
||||
|
||||
// Write looper is running.
|
||||
@@ -4893,7 +4892,6 @@ TEST_P(
|
||||
stream->writeBuffer.append(std::move(dataBuf));
|
||||
|
||||
// Insert streamId into the list.
|
||||
conn->streamManager->addWritable(*stream);
|
||||
conn->streamManager->updateWritableStreams(*stream);
|
||||
|
||||
// Write looper is stopped.
|
||||
@@ -4929,7 +4927,6 @@ TEST_P(
|
||||
stream->writeBuffer.append(std::move(dataBuf));
|
||||
|
||||
// Insert streamId into the list.
|
||||
conn->streamManager->addWritable(*stream);
|
||||
conn->streamManager->updateWritableStreams(*stream);
|
||||
|
||||
// Write looper is running.
|
||||
@@ -4969,7 +4966,6 @@ TEST_P(
|
||||
stream->writeBuffer.append(std::move(dataBuf));
|
||||
|
||||
// Insert streamId into the list.
|
||||
conn->streamManager->addWritable(*stream);
|
||||
conn->streamManager->updateWritableStreams(*stream);
|
||||
|
||||
// Write looper is running.
|
||||
@@ -5038,7 +5034,6 @@ TEST_P(
|
||||
conn->flowControlState.sumCurStreamBufferLen = testString.length();
|
||||
|
||||
// Insert streamId into the list.
|
||||
conn->streamManager->addWritable(*stream);
|
||||
conn->streamManager->updateWritableStreams(*stream);
|
||||
|
||||
// Mock arming the write callback
|
||||
@@ -5108,7 +5103,6 @@ TEST_P(
|
||||
stream->writeBuffer.append(std::move(dataBuf));
|
||||
|
||||
// Insert streamId into the list.
|
||||
conn->streamManager->addWritable(*stream);
|
||||
conn->streamManager->updateWritableStreams(*stream);
|
||||
|
||||
// Write looper is running.
|
||||
|
@@ -3766,7 +3766,7 @@ TEST_F(QuicTransportFunctionsTest, HasAppDataToWrite) {
|
||||
conn->flowControlState.sumCurWriteOffset = 800;
|
||||
QuicStreamState stream(0, *conn);
|
||||
writeDataToQuicStream(stream, folly::IOBuf::copyBuffer("I'm a devil"), true);
|
||||
conn->streamManager->addWritable(stream);
|
||||
conn->streamManager->updateWritableStreams(stream);
|
||||
EXPECT_EQ(WriteDataReason::NO_WRITE, hasNonAckDataToWrite(*conn));
|
||||
|
||||
conn->oneRttWriteCipher = test::createNoOpAead();
|
||||
|
@@ -492,32 +492,6 @@ class QuicStreamManager {
|
||||
return !writableStreams_.empty() || !controlWriteQueue_.empty();
|
||||
}
|
||||
|
||||
/*
|
||||
* Add a writable stream id.
|
||||
*/
|
||||
void addWritable(const QuicStreamState& stream) {
|
||||
if (stream.isControl) {
|
||||
// Control streams get their own queue.
|
||||
CHECK(stream.hasSchedulableData());
|
||||
controlWriteQueue_.insert(stream.id);
|
||||
} else {
|
||||
CHECK(stream.hasSchedulableData() || stream.hasSchedulableDsr());
|
||||
writeQueue_.insertOrUpdate(stream.id, stream.priority);
|
||||
}
|
||||
if (stream.hasWritableData()) {
|
||||
writableStreams_.insert(stream.id);
|
||||
}
|
||||
if (stream.hasWritableBufMeta()) {
|
||||
writableDSRStreams_.insert(stream.id);
|
||||
}
|
||||
if (!stream.lossBuffer.empty()) {
|
||||
lossStreams_.insert(stream.id);
|
||||
}
|
||||
if (!stream.lossBufMetas.empty()) {
|
||||
lossDSRStreams_.insert(stream.id);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Remove a writable stream id.
|
||||
*/
|
||||
|
@@ -1772,7 +1772,7 @@ TEST_P(QuicStreamFunctionsTestBase, RemovedClosedState) {
|
||||
conn.streamManager->readableStreams().emplace(streamId);
|
||||
conn.streamManager->peekableStreams().emplace(streamId);
|
||||
writeDataToQuicStream(*stream, folly::IOBuf::copyBuffer("write data"), true);
|
||||
conn.streamManager->addWritable(*stream);
|
||||
conn.streamManager->updateWritableStreams(*stream);
|
||||
conn.streamManager->queueBlocked(streamId, 0);
|
||||
conn.streamManager->addDeliverable(streamId);
|
||||
conn.streamManager->addLoss(streamId);
|
||||
|
Reference in New Issue
Block a user