| Index: net/quic/core/quic_stream.cc
|
| diff --git a/net/quic/core/quic_stream.cc b/net/quic/core/quic_stream.cc
|
| index 3287a0926bae040ea6edfb18f42407270da7aab6..8c5c26a237c422a8cd539c262a0d3027acf09dec 100644
|
| --- a/net/quic/core/quic_stream.cc
|
| +++ b/net/quic/core/quic_stream.cc
|
| @@ -4,12 +4,12 @@
|
|
|
| #include "net/quic/core/quic_stream.h"
|
|
|
| -#include "base/logging.h"
|
| #include "net/quic/core/quic_bug_tracker.h"
|
| #include "net/quic/core/quic_flags.h"
|
| #include "net/quic/core/quic_flow_controller.h"
|
| #include "net/quic/core/quic_session.h"
|
| #include "net/quic/core/quic_write_blocked_list.h"
|
| +#include "net/quic/platform/api/quic_logging.h"
|
|
|
| using base::StringPiece;
|
| using std::string;
|
| @@ -96,8 +96,9 @@ void QuicStream::OnStreamFrame(const QuicStreamFrame& frame) {
|
| }
|
|
|
| if (read_side_closed_) {
|
| - DVLOG(1) << ENDPOINT << "Stream " << frame.stream_id
|
| - << " is closed for reading. Ignoring newly received stream data.";
|
| + QUIC_DLOG(INFO)
|
| + << ENDPOINT << "Stream " << frame.stream_id
|
| + << " is closed for reading. Ignoring newly received stream data.";
|
| // The subclass does not want to read data: blackhole the data.
|
| return;
|
| }
|
| @@ -193,7 +194,8 @@ void QuicStream::WriteOrBufferData(
|
| return;
|
| }
|
| if (write_side_closed_) {
|
| - DLOG(ERROR) << ENDPOINT << "Attempt to write when the write side is closed";
|
| + QUIC_DLOG(ERROR) << ENDPOINT
|
| + << "Attempt to write when the write side is closed";
|
| return;
|
| }
|
|
|
| @@ -272,7 +274,8 @@ QuicConsumedData QuicStream::WritevData(
|
| bool fin,
|
| QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener) {
|
| if (write_side_closed_) {
|
| - DLOG(ERROR) << ENDPOINT << "Attempt to write when the write side is closed";
|
| + QUIC_DLOG(ERROR) << ENDPOINT
|
| + << "Attempt to write when the write side is closed";
|
| return QuicConsumedData(0, false);
|
| }
|
|
|
| @@ -311,8 +314,8 @@ QuicConsumedData QuicStream::WritevData(
|
|
|
| // Writing more data would be a violation of flow control.
|
| write_length = static_cast<size_t>(send_window);
|
| - DVLOG(1) << "stream " << id() << " shortens write length to "
|
| - << write_length << " due to flow control";
|
| + QUIC_DVLOG(1) << "stream " << id() << " shortens write length to "
|
| + << write_length << " due to flow control";
|
| }
|
|
|
| QuicConsumedData consumed_data =
|
| @@ -360,13 +363,13 @@ void QuicStream::CloseReadSide() {
|
| if (read_side_closed_) {
|
| return;
|
| }
|
| - DVLOG(1) << ENDPOINT << "Done reading from stream " << id();
|
| + QUIC_DLOG(INFO) << ENDPOINT << "Done reading from stream " << id();
|
|
|
| read_side_closed_ = true;
|
| sequencer_.ReleaseBuffer();
|
|
|
| if (write_side_closed_) {
|
| - DVLOG(1) << ENDPOINT << "Closing stream: " << id();
|
| + QUIC_DLOG(INFO) << ENDPOINT << "Closing stream: " << id();
|
| session_->CloseStream(id());
|
| }
|
| }
|
| @@ -375,11 +378,11 @@ void QuicStream::CloseWriteSide() {
|
| if (write_side_closed_) {
|
| return;
|
| }
|
| - DVLOG(1) << ENDPOINT << "Done writing to stream " << id();
|
| + QUIC_DLOG(INFO) << ENDPOINT << "Done writing to stream " << id();
|
|
|
| write_side_closed_ = true;
|
| if (read_side_closed_) {
|
| - DVLOG(1) << ENDPOINT << "Closing stream: " << id();
|
| + QUIC_DLOG(INFO) << ENDPOINT << "Closing stream: " << id();
|
| session_->CloseStream(id());
|
| }
|
| }
|
| @@ -393,7 +396,7 @@ QuicVersion QuicStream::version() const {
|
| }
|
|
|
| void QuicStream::StopReading() {
|
| - DVLOG(1) << ENDPOINT << "Stop reading from stream " << id();
|
| + QUIC_DLOG(INFO) << ENDPOINT << "Stop reading from stream " << id();
|
| sequencer_.StopReading();
|
| }
|
|
|
| @@ -409,7 +412,7 @@ void QuicStream::OnClose() {
|
| // For flow control accounting, tell the peer how many bytes have been
|
| // written on this stream before termination. Done here if needed, using a
|
| // RST_STREAM frame.
|
| - DVLOG(1) << ENDPOINT << "Sending RST_STREAM in OnClose: " << id();
|
| + QUIC_DLOG(INFO) << ENDPOINT << "Sending RST_STREAM in OnClose: " << id();
|
| session_->SendRstStream(id(), QUIC_RST_ACKNOWLEDGEMENT,
|
| stream_bytes_written_);
|
| rst_sent_ = true;
|
|
|