Skip to content

Commit

Permalink
cleanup addWritable
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pfarcasanu authored and facebook-github-bot committed Jan 22, 2025
1 parent 9a46de2 commit d0c124f
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 34 deletions.
6 changes: 0 additions & 6 deletions quic/api/test/QuicTransportBaseTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion quic/api/test/QuicTransportFunctionsTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
26 changes: 0 additions & 26 deletions quic/state/QuicStreamManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion quic/state/test/QuicStreamFunctionsTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d0c124f

Please sign in to comment.