Skip to content

Commit dfdcbea

Browse files
Aman Sharmafacebook-github-bot
Aman Sharma
authored andcommitted
Change Buf -> BufPtr and RawBuf -> Buf
Summary: Previously, * `RawBuf` was a typealias for `std::unique_ptr<folly::IOBuf>` * `Buf` was a typealias for `folly::IOBuf` In this diff, * `Buf` is a typealias for `folly::IOBuf` * `BufPtr` is a typealias for `std::unique_ptr<folly::IOBuf>` Reviewed By: hanidamlaj Differential Revision: D73206576 fbshipit-source-id: 454bf6ccfce3d6571e5e931889263ed98cc24af3
1 parent 17a0cfc commit dfdcbea

File tree

7 files changed

+15
-13
lines changed

7 files changed

+15
-13
lines changed

proxygen/httpserver/samples/hq/HQClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ void HQClient::sendKnobFrame(const folly::StringPiece str) {
250250
}
251251
uint64_t knobSpace = 0xfaceb00c;
252252
uint64_t knobId = 100;
253-
Buf buf(folly::IOBuf::create(str.size()));
253+
BufPtr buf(folly::IOBuf::create(str.size()));
254254
memcpy(buf->writableData(), str.data(), str.size());
255255
buf->append(str.size());
256256
VLOG(10) << "Sending Knob Frame to peer. KnobSpace: " << std::hex << knobSpace

proxygen/httpserver/samples/hq/HQServerModule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void sendKnobFrame(HQSession* session, const folly::StringPiece str) {
2020
}
2121
uint64_t knobSpace = 0xfaceb00c;
2222
uint64_t knobId = 200;
23-
quic::Buf buf(folly::IOBuf::create(str.size()));
23+
quic::BufPtr buf(folly::IOBuf::create(str.size()));
2424
memcpy(buf->writableData(), str.data(), str.size());
2525
buf->append(str.size());
2626
VLOG(10) << "Sending Knob Frame to peer. KnobSpace: " << std::hex << knobSpace

proxygen/lib/http/session/HQSession.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ void HQSession::onStopSending(quic::StreamId id,
283283

284284
void HQSession::onKnob(uint64_t knobSpace,
285285
uint64_t knobId,
286-
quic::Buf knobBlob) {
286+
quic::BufPtr knobBlob) {
287287
VLOG(3) << __func__ << " sess=" << *this
288288
<< " knob frame received: " << " KnobSpace: " << std::hex << knobSpace
289289
<< " KnobId: " << knobId << " KnobBlob: "
@@ -1295,7 +1295,7 @@ void HQSession::readControlStream(HQControlStream* ctrlStream) {
12951295
return;
12961296
}
12971297
resetTimeout();
1298-
quic::Buf data = std::move(readRes.value().first);
1298+
quic::BufPtr data = std::move(readRes.value().first);
12991299
auto readSize = data ? data->computeChainDataLength() : 0;
13001300
VLOG(4) << "Read " << readSize << " bytes from control stream";
13011301
ctrlStream->readBuf_.append(std::move(data));
@@ -1443,7 +1443,7 @@ void HQSession::readRequestStream(quic::StreamId id) noexcept {
14431443
}
14441444

14451445
resetTimeout();
1446-
quic::Buf data = std::move(readRes.value().first);
1446+
quic::BufPtr data = std::move(readRes.value().first);
14471447
auto readSize = data ? data->computeChainDataLength() : 0;
14481448
hqStream->readEOF_ = readRes.value().second;
14491449
VLOG(3) << "Got streamID=" << hqStream->getStreamId() << " len=" << readSize
@@ -3814,8 +3814,8 @@ HQSession::HQStreamTransport::sendDatagram(
38143814
// [Context ID (i)],
38153815
// HTTP/3 Datagram Payload (..),
38163816
// }
3817-
quic::Buf headerBuf =
3818-
quic::Buf(folly::IOBuf::create(session_.sock_->getDatagramSizeLimit()));
3817+
quic::BufPtr headerBuf = quic::BufPtr(
3818+
folly::IOBuf::create(session_.sock_->getDatagramSizeLimit()));
38193819
quic::BufAppender appender(headerBuf.get(), kMaxDatagramHeaderSize);
38203820
auto streamIdRes = quic::encodeQuicInteger(
38213821
streamId_.value() / 4, [&](auto val) { appender.writeBE(val); });

proxygen/lib/http/session/HQSession.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@ class HQSession
195195

196196
void onConnectionError(quic::QuicError code) noexcept override;
197197

198-
void onKnob(uint64_t knobSpace, uint64_t knobId, quic::Buf knobBlob) override;
198+
void onKnob(uint64_t knobSpace,
199+
uint64_t knobId,
200+
quic::BufPtr knobBlob) override;
199201

200202
// returns false in case of failure
201203
bool onTransportReadyCommon() noexcept;
@@ -374,7 +376,7 @@ class HQSession
374376
* Sends a knob frame on the session.
375377
*/
376378
folly::Expected<folly::Unit, quic::LocalErrorCode> sendKnob(
377-
uint64_t knobSpace, uint64_t knobId, quic::Buf knobBlob) {
379+
uint64_t knobSpace, uint64_t knobId, quic::BufPtr knobBlob) {
378380
return sock_->setKnob(knobSpace, knobId, std::move(knobBlob));
379381
}
380382

proxygen/lib/http/session/test/HQSessionTestCommon.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ class HQSessionTest
373373
// [Context ID (i)],
374374
// HTTP/3 Datagram Payload (..),
375375
// }
376-
quic::Buf headerBuf = quic::Buf(folly::IOBuf::create(0));
376+
quic::BufPtr headerBuf = quic::BufPtr(folly::IOBuf::create(0));
377377
quic::BufAppender appender(headerBuf.get(),
378378
proxygen::kMaxDatagramHeaderSize);
379379
auto streamIdRes = quic::encodeQuicInteger(

proxygen/lib/http/session/test/MockQuicSocketDriver.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ class MockQuicSocketDriver : public folly::EventBase::LoopCallback {
464464

465465
EXPECT_CALL(*sock_, readDatagramBufs(testing::_))
466466
.WillRepeatedly(testing::Invoke(
467-
[this](size_t atMost) -> folly::Expected<std::vector<quic::Buf>,
467+
[this](size_t atMost) -> folly::Expected<std::vector<quic::BufPtr>,
468468
quic::LocalErrorCode> {
469469
auto& connStream = streams_[kConnectionStreamId];
470470
if (connStream.writeState == CLOSED) {
@@ -476,7 +476,7 @@ class MockQuicSocketDriver : public folly::EventBase::LoopCallback {
476476
} else {
477477
atMost = std::min(atMost, inDatagrams_.size());
478478
}
479-
std::vector<Buf> retDatagrams;
479+
std::vector<BufPtr> retDatagrams;
480480
retDatagrams.reserve(atMost);
481481
std::transform(
482482
inDatagrams_.begin(),

proxygen/lib/http/webtransport/WebTransportImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ void WebTransportImpl::StreamReadHandle::readAvailable(
257257
impl_.wtIngressStreams_.erase(getID());
258258
return;
259259
}
260-
quic::Buf data = std::move(readRes.value().first);
260+
quic::BufPtr data = std::move(readRes.value().first);
261261
bool eof = readRes.value().second;
262262
// deliver data, eof
263263
auto state = dataAvailable(std::move(data), eof);

0 commit comments

Comments
 (0)