Remove QuicStream::WritevData().
This method has only one caller from yperf, and that can be modified to call WriteMemSlices().
gfe-relnote: code unused by gfe. Not protected.
PiperOrigin-RevId: 278946079
Change-Id: I33bc9416247ceda692f2037021ccf161269d2845
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc
index b07a232..c148961 100644
--- a/quic/core/quic_session_test.cc
+++ b/quic/core/quic_session_test.cc
@@ -135,7 +135,6 @@
using QuicStream::CloseReadSide;
using QuicStream::CloseWriteSide;
using QuicStream::WriteMemSlices;
- using QuicStream::WritevData;
void OnDataAvailable() override {}
diff --git a/quic/core/quic_stream.cc b/quic/core/quic_stream.cc
index 360ac30..ee9cb7b 100644
--- a/quic/core/quic_stream.cc
+++ b/quic/core/quic_stream.cc
@@ -671,64 +671,6 @@
}
}
-QuicConsumedData QuicStream::WritevData(const struct iovec* iov,
- int iov_count,
- bool fin) {
- if (write_side_closed_) {
- QUIC_DLOG(ERROR) << ENDPOINT << "Stream " << id()
- << "attempting to write when the write side is closed";
- if (type_ == READ_UNIDIRECTIONAL) {
- CloseConnectionWithDetails(
- QUIC_TRY_TO_WRITE_DATA_ON_READ_UNIDIRECTIONAL_STREAM,
- "Try to send data on read unidirectional stream");
- }
- return QuicConsumedData(0, false);
- }
-
- // How much data was provided.
- size_t write_length = 0;
- if (iov != nullptr) {
- for (int i = 0; i < iov_count; ++i) {
- write_length += iov[i].iov_len;
- }
- }
-
- QuicConsumedData consumed_data(0, false);
- if (fin_buffered_) {
- QUIC_BUG << "Fin already buffered";
- return consumed_data;
- }
-
- if (kMaxStreamLength - send_buffer_.stream_offset() < write_length) {
- QUIC_BUG << "Write too many data via stream " << id_;
- CloseConnectionWithDetails(
- QUIC_STREAM_LENGTH_OVERFLOW,
- QuicStrCat("Write too many data via stream ", id_));
- return consumed_data;
- }
-
- bool had_buffered_data = HasBufferedData();
- if (CanWriteNewData()) {
- // Save all data if buffered data size is below low water mark.
- consumed_data.bytes_consumed = write_length;
- if (consumed_data.bytes_consumed > 0) {
- QuicStreamOffset offset = send_buffer_.stream_offset();
- send_buffer_.SaveStreamData(iov, iov_count, 0, write_length);
- OnDataBuffered(offset, write_length, nullptr);
- }
- }
- consumed_data.fin_consumed =
- consumed_data.bytes_consumed == write_length && fin;
- fin_buffered_ = consumed_data.fin_consumed;
-
- if (!had_buffered_data && (HasBufferedData() || fin_buffered_)) {
- // Write data if there is no buffered data before.
- WriteBufferedData();
- }
-
- return consumed_data;
-}
-
QuicConsumedData QuicStream::WriteMemSlices(QuicMemSliceSpan span, bool fin) {
QuicConsumedData consumed_data(0, false);
if (span.empty() && !fin) {
diff --git a/quic/core/quic_stream.h b/quic/core/quic_stream.h
index 55d0bd4..c7df448 100644
--- a/quic/core/quic_stream.h
+++ b/quic/core/quic_stream.h
@@ -354,16 +354,6 @@
bool is_static() const { return is_static_; }
protected:
- // Sends as many bytes in the first |count| buffers of |iov| to the connection
- // as the connection will consume. If FIN is consumed, the write side is
- // immediately closed.
- // Returns the number of bytes consumed by the connection.
- // Please note: Returned consumed data is the amount of data saved in send
- // buffer. The data is not necessarily consumed by the connection. So write
- // side is closed when FIN is sent.
- // TODO(fayang): Let WritevData return boolean.
- QuicConsumedData WritevData(const struct iovec* iov, int iov_count, bool fin);
-
// Close the read side of the socket. May cause the stream to be closed.
// Subclasses and consumers should use StopReading to terminate reading early
// if expecting a FIN. Can be used directly by subclasses if not expecting a
diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc
index c82b4d0..e68ed58 100644
--- a/quic/core/quic_stream_test.cc
+++ b/quic/core/quic_stream_test.cc
@@ -70,7 +70,6 @@
using QuicStream::OnClose;
using QuicStream::WriteMemSlices;
using QuicStream::WriteOrBufferData;
- using QuicStream::WritevData;
private:
std::string data_;