Remove http2_logging.h. Replace HTTP2_*LOG macros with QUICHE_*LOG. PiperOrigin-RevId: 445967302
diff --git a/quiche/http2/decoder/decode_buffer.h b/quiche/http2/decoder/decode_buffer.h index e44231d..0824b1f 100644 --- a/quiche/http2/decoder/decode_buffer.h +++ b/quiche/http2/decoder/decode_buffer.h
@@ -18,8 +18,8 @@ #include <cstdint> #include "absl/strings/string_view.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { class DecodeBufferSubset;
diff --git a/quiche/http2/decoder/decode_buffer_test.cc b/quiche/http2/decoder/decode_buffer_test.cc index c72e32b..7485dac 100644 --- a/quiche/http2/decoder/decode_buffer_test.cc +++ b/quiche/http2/decoder/decode_buffer_test.cc
@@ -6,8 +6,8 @@ #include <functional> -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/http2_random.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 {
diff --git a/quiche/http2/decoder/decode_http2_structures.cc b/quiche/http2/decoder/decode_http2_structures.cc index 8930272..1730a21 100644 --- a/quiche/http2/decoder/decode_http2_structures.cc +++ b/quiche/http2/decoder/decode_http2_structures.cc
@@ -9,7 +9,7 @@ #include "quiche/http2/decoder/decode_buffer.h" #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/decoder/decode_http2_structures_test.cc b/quiche/http2/decoder/decode_http2_structures_test.cc index a85859a..7266249 100644 --- a/quiche/http2/decoder/decode_http2_structures_test.cc +++ b/quiche/http2/decoder/decode_http2_structures_test.cc
@@ -16,9 +16,9 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 {
diff --git a/quiche/http2/decoder/decode_status.cc b/quiche/http2/decoder/decode_status.cc index ddb8c3b..c5887ad 100644 --- a/quiche/http2/decoder/decode_status.cc +++ b/quiche/http2/decoder/decode_status.cc
@@ -4,8 +4,8 @@ #include "quiche/http2/decoder/decode_status.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/decoder/frame_decoder_state.cc b/quiche/http2/decoder/frame_decoder_state.cc index 0467486..fe535a5 100644 --- a/quiche/http2/decoder/frame_decoder_state.cc +++ b/quiche/http2/decoder/frame_decoder_state.cc
@@ -8,8 +8,8 @@ DecodeStatus FrameDecoderState::ReadPadLength(DecodeBuffer* db, bool report_pad_length) { - HTTP2_DVLOG(2) << "ReadPadLength db->Remaining=" << db->Remaining() - << "; payload_length=" << frame_header().payload_length; + QUICHE_DVLOG(2) << "ReadPadLength db->Remaining=" << db->Remaining() + << "; payload_length=" << frame_header().payload_length; QUICHE_DCHECK(IsPaddable()); QUICHE_DCHECK(frame_header().IsPadded()); @@ -51,9 +51,9 @@ } bool FrameDecoderState::SkipPadding(DecodeBuffer* db) { - HTTP2_DVLOG(2) << "SkipPadding remaining_padding_=" << remaining_padding_ - << ", db->Remaining=" << db->Remaining() - << ", header: " << frame_header(); + QUICHE_DVLOG(2) << "SkipPadding remaining_padding_=" << remaining_padding_ + << ", db->Remaining=" << db->Remaining() + << ", header: " << frame_header(); QUICHE_DCHECK_EQ(remaining_payload_, 0u); QUICHE_DCHECK(IsPaddable()) << "header: " << frame_header(); QUICHE_DCHECK(remaining_padding_ == 0 || frame_header().IsPadded()) @@ -69,10 +69,10 @@ } DecodeStatus FrameDecoderState::ReportFrameSizeError() { - HTTP2_DVLOG(2) << "FrameDecoderState::ReportFrameSizeError: " - << " remaining_payload_=" << remaining_payload_ - << "; remaining_padding_=" << remaining_padding_ - << ", header: " << frame_header(); + QUICHE_DVLOG(2) << "FrameDecoderState::ReportFrameSizeError: " + << " remaining_payload_=" << remaining_payload_ + << "; remaining_padding_=" << remaining_padding_ + << ", header: " << frame_header(); listener()->OnFrameSizeError(frame_header()); return DecodeStatus::kDecodeError; }
diff --git a/quiche/http2/decoder/frame_decoder_state.h b/quiche/http2/decoder/frame_decoder_state.h index aac7154..3e01155 100644 --- a/quiche/http2/decoder/frame_decoder_state.h +++ b/quiche/http2/decoder/frame_decoder_state.h
@@ -22,8 +22,8 @@ #include "quiche/http2/decoder/http2_structure_decoder.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace test { @@ -60,15 +60,15 @@ // remaining payload. template <class S> DecodeStatus StartDecodingStructureInPayload(S* out, DecodeBuffer* db) { - HTTP2_DVLOG(2) << __func__ << "\n\tdb->Remaining=" << db->Remaining() - << "\n\tremaining_payload_=" << remaining_payload_ - << "\n\tneed=" << S::EncodedSize(); + QUICHE_DVLOG(2) << __func__ << "\n\tdb->Remaining=" << db->Remaining() + << "\n\tremaining_payload_=" << remaining_payload_ + << "\n\tneed=" << S::EncodedSize(); DecodeStatus status = structure_decoder_.Start(out, db, &remaining_payload_); if (status != DecodeStatus::kDecodeError) { return status; } - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "StartDecodingStructureInPayload: detected frame size error"; return ReportFrameSizeError(); } @@ -78,14 +78,14 @@ // the payload. Returns values are as for StartDecodingStructureInPayload. template <class S> DecodeStatus ResumeDecodingStructureInPayload(S* out, DecodeBuffer* db) { - HTTP2_DVLOG(2) << __func__ << "\n\tdb->Remaining=" << db->Remaining() - << "\n\tremaining_payload_=" << remaining_payload_; + QUICHE_DVLOG(2) << __func__ << "\n\tdb->Remaining=" << db->Remaining() + << "\n\tremaining_payload_=" << remaining_payload_; if (structure_decoder_.Resume(out, db, &remaining_payload_)) { return DecodeStatus::kDecodeDone; } else if (remaining_payload_ > 0) { return DecodeStatus::kDecodeInProgress; } else { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "ResumeDecodingStructureInPayload: detected frame size error"; return ReportFrameSizeError(); }
diff --git a/quiche/http2/decoder/frame_decoder_state_test_util.cc b/quiche/http2/decoder/frame_decoder_state_test_util.cc index 9f34210..7a1d759 100644 --- a/quiche/http2/decoder/frame_decoder_state_test_util.cc +++ b/quiche/http2/decoder/frame_decoder_state_test_util.cc
@@ -7,16 +7,16 @@ #include "quiche/http2/decoder/http2_structure_decoder_test_util.h" #include "quiche/http2/http2_structures.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace test { // static void FrameDecoderStatePeer::Randomize(FrameDecoderState* p, Http2Random* rng) { - HTTP2_VLOG(1) << "FrameDecoderStatePeer::Randomize"; + QUICHE_VLOG(1) << "FrameDecoderStatePeer::Randomize"; ::http2::test::Randomize(&p->frame_header_, rng); p->remaining_payload_ = rng->Rand32(); p->remaining_padding_ = rng->Rand32(); @@ -26,7 +26,7 @@ // static void FrameDecoderStatePeer::set_frame_header(const Http2FrameHeader& header, FrameDecoderState* p) { - HTTP2_VLOG(1) << "FrameDecoderStatePeer::set_frame_header " << header; + QUICHE_VLOG(1) << "FrameDecoderStatePeer::set_frame_header " << header; p->frame_header_ = header; }
diff --git a/quiche/http2/decoder/http2_frame_decoder.cc b/quiche/http2/decoder/http2_frame_decoder.cc index e9dce51..0225d93 100644 --- a/quiche/http2/decoder/http2_frame_decoder.cc +++ b/quiche/http2/decoder/http2_frame_decoder.cc
@@ -50,7 +50,7 @@ } DecodeStatus Http2FrameDecoder::DecodeFrame(DecodeBuffer* db) { - HTTP2_DVLOG(2) << "Http2FrameDecoder::DecodeFrame state=" << state_; + QUICHE_DVLOG(2) << "Http2FrameDecoder::DecodeFrame state=" << state_; switch (state_) { case State::kStartDecodingHeader: if (frame_decoder_state_.StartDecodingFrameHeader(db)) { @@ -90,17 +90,17 @@ // TODO(jamessynge): Remove OnFrameHeader once done with supporting // SpdyFramer's exact states. if (!listener()->OnFrameHeader(header)) { - HTTP2_DVLOG(2) << "OnFrameHeader rejected the frame, will discard; header: " - << header; + QUICHE_DVLOG(2) + << "OnFrameHeader rejected the frame, will discard; header: " << header; state_ = State::kDiscardPayload; frame_decoder_state_.InitializeRemainders(); return DecodeStatus::kDecodeError; } if (header.payload_length > maximum_payload_size_) { - HTTP2_DVLOG(2) << "Payload length is greater than allowed: " - << header.payload_length << " > " << maximum_payload_size_ - << "\n header: " << header; + QUICHE_DVLOG(2) << "Payload length is greater than allowed: " + << header.payload_length << " > " << maximum_payload_size_ + << "\n header: " << header; state_ = State::kDiscardPayload; frame_decoder_state_.InitializeRemainders(); listener()->OnFrameSizeError(header); @@ -435,15 +435,15 @@ } DecodeStatus Http2FrameDecoder::DiscardPayload(DecodeBuffer* db) { - HTTP2_DVLOG(2) << "remaining_payload=" - << frame_decoder_state_.remaining_payload_ - << "; remaining_padding=" - << frame_decoder_state_.remaining_padding_; + QUICHE_DVLOG(2) << "remaining_payload=" + << frame_decoder_state_.remaining_payload_ + << "; remaining_padding=" + << frame_decoder_state_.remaining_padding_; frame_decoder_state_.remaining_payload_ += frame_decoder_state_.remaining_padding_; frame_decoder_state_.remaining_padding_ = 0; const size_t avail = frame_decoder_state_.AvailablePayload(db); - HTTP2_DVLOG(2) << "avail=" << avail; + QUICHE_DVLOG(2) << "avail=" << avail; if (avail > 0) { frame_decoder_state_.ConsumePayload(avail); db->AdvanceCursor(avail);
diff --git a/quiche/http2/decoder/http2_frame_decoder.h b/quiche/http2/decoder/http2_frame_decoder.h index 70c3858..1df3d76 100644 --- a/quiche/http2/decoder/http2_frame_decoder.h +++ b/quiche/http2/decoder/http2_frame_decoder.h
@@ -39,8 +39,8 @@ #include "quiche/http2/decoder/payload_decoders/unknown_payload_decoder.h" #include "quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace test {
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc index debec83..18a193d 100644 --- a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc +++ b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.cc
@@ -7,7 +7,7 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -209,7 +209,7 @@ bool LoggingHttp2FrameDecoderListener::OnFrameHeader( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnFrameHeader: " << header; + QUICHE_VLOG(1) << "OnFrameHeader: " << header; if (wrapped_ != nullptr) { return wrapped_->OnFrameHeader(header); } @@ -218,7 +218,7 @@ void LoggingHttp2FrameDecoderListener::OnDataStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnDataStart: " << header; + QUICHE_VLOG(1) << "OnDataStart: " << header; if (wrapped_ != nullptr) { wrapped_->OnDataStart(header); } @@ -226,14 +226,14 @@ void LoggingHttp2FrameDecoderListener::OnDataPayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnDataPayload: len=" << len; + QUICHE_VLOG(1) << "OnDataPayload: len=" << len; if (wrapped_ != nullptr) { wrapped_->OnDataPayload(data, len); } } void LoggingHttp2FrameDecoderListener::OnDataEnd() { - HTTP2_VLOG(1) << "OnDataEnd"; + QUICHE_VLOG(1) << "OnDataEnd"; if (wrapped_ != nullptr) { wrapped_->OnDataEnd(); } @@ -241,7 +241,7 @@ void LoggingHttp2FrameDecoderListener::OnHeadersStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnHeadersStart: " << header; + QUICHE_VLOG(1) << "OnHeadersStart: " << header; if (wrapped_ != nullptr) { wrapped_->OnHeadersStart(header); } @@ -249,7 +249,7 @@ void LoggingHttp2FrameDecoderListener::OnHeadersPriority( const Http2PriorityFields& priority) { - HTTP2_VLOG(1) << "OnHeadersPriority: " << priority; + QUICHE_VLOG(1) << "OnHeadersPriority: " << priority; if (wrapped_ != nullptr) { wrapped_->OnHeadersPriority(priority); } @@ -257,14 +257,14 @@ void LoggingHttp2FrameDecoderListener::OnHpackFragment(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnHpackFragment: len=" << len; + QUICHE_VLOG(1) << "OnHpackFragment: len=" << len; if (wrapped_ != nullptr) { wrapped_->OnHpackFragment(data, len); } } void LoggingHttp2FrameDecoderListener::OnHeadersEnd() { - HTTP2_VLOG(1) << "OnHeadersEnd"; + QUICHE_VLOG(1) << "OnHeadersEnd"; if (wrapped_ != nullptr) { wrapped_->OnHeadersEnd(); } @@ -272,7 +272,7 @@ void LoggingHttp2FrameDecoderListener::OnPriorityFrame( const Http2FrameHeader& header, const Http2PriorityFields& priority) { - HTTP2_VLOG(1) << "OnPriorityFrame: " << header << "; priority: " << priority; + QUICHE_VLOG(1) << "OnPriorityFrame: " << header << "; priority: " << priority; if (wrapped_ != nullptr) { wrapped_->OnPriorityFrame(header, priority); } @@ -280,21 +280,21 @@ void LoggingHttp2FrameDecoderListener::OnContinuationStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnContinuationStart: " << header; + QUICHE_VLOG(1) << "OnContinuationStart: " << header; if (wrapped_ != nullptr) { wrapped_->OnContinuationStart(header); } } void LoggingHttp2FrameDecoderListener::OnContinuationEnd() { - HTTP2_VLOG(1) << "OnContinuationEnd"; + QUICHE_VLOG(1) << "OnContinuationEnd"; if (wrapped_ != nullptr) { wrapped_->OnContinuationEnd(); } } void LoggingHttp2FrameDecoderListener::OnPadLength(size_t trailing_length) { - HTTP2_VLOG(1) << "OnPadLength: trailing_length=" << trailing_length; + QUICHE_VLOG(1) << "OnPadLength: trailing_length=" << trailing_length; if (wrapped_ != nullptr) { wrapped_->OnPadLength(trailing_length); } @@ -302,7 +302,7 @@ void LoggingHttp2FrameDecoderListener::OnPadding(const char* padding, size_t skipped_length) { - HTTP2_VLOG(1) << "OnPadding: skipped_length=" << skipped_length; + QUICHE_VLOG(1) << "OnPadding: skipped_length=" << skipped_length; if (wrapped_ != nullptr) { wrapped_->OnPadding(padding, skipped_length); } @@ -310,7 +310,7 @@ void LoggingHttp2FrameDecoderListener::OnRstStream( const Http2FrameHeader& header, Http2ErrorCode error_code) { - HTTP2_VLOG(1) << "OnRstStream: " << header << "; code=" << error_code; + QUICHE_VLOG(1) << "OnRstStream: " << header << "; code=" << error_code; if (wrapped_ != nullptr) { wrapped_->OnRstStream(header, error_code); } @@ -318,7 +318,7 @@ void LoggingHttp2FrameDecoderListener::OnSettingsStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnSettingsStart: " << header; + QUICHE_VLOG(1) << "OnSettingsStart: " << header; if (wrapped_ != nullptr) { wrapped_->OnSettingsStart(header); } @@ -326,14 +326,14 @@ void LoggingHttp2FrameDecoderListener::OnSetting( const Http2SettingFields& setting_fields) { - HTTP2_VLOG(1) << "OnSetting: " << setting_fields; + QUICHE_VLOG(1) << "OnSetting: " << setting_fields; if (wrapped_ != nullptr) { wrapped_->OnSetting(setting_fields); } } void LoggingHttp2FrameDecoderListener::OnSettingsEnd() { - HTTP2_VLOG(1) << "OnSettingsEnd"; + QUICHE_VLOG(1) << "OnSettingsEnd"; if (wrapped_ != nullptr) { wrapped_->OnSettingsEnd(); } @@ -341,7 +341,7 @@ void LoggingHttp2FrameDecoderListener::OnSettingsAck( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnSettingsAck: " << header; + QUICHE_VLOG(1) << "OnSettingsAck: " << header; if (wrapped_ != nullptr) { wrapped_->OnSettingsAck(header); } @@ -350,15 +350,15 @@ void LoggingHttp2FrameDecoderListener::OnPushPromiseStart( const Http2FrameHeader& header, const Http2PushPromiseFields& promise, size_t total_padding_length) { - HTTP2_VLOG(1) << "OnPushPromiseStart: " << header << "; promise: " << promise - << "; total_padding_length: " << total_padding_length; + QUICHE_VLOG(1) << "OnPushPromiseStart: " << header << "; promise: " << promise + << "; total_padding_length: " << total_padding_length; if (wrapped_ != nullptr) { wrapped_->OnPushPromiseStart(header, promise, total_padding_length); } } void LoggingHttp2FrameDecoderListener::OnPushPromiseEnd() { - HTTP2_VLOG(1) << "OnPushPromiseEnd"; + QUICHE_VLOG(1) << "OnPushPromiseEnd"; if (wrapped_ != nullptr) { wrapped_->OnPushPromiseEnd(); } @@ -366,7 +366,7 @@ void LoggingHttp2FrameDecoderListener::OnPing(const Http2FrameHeader& header, const Http2PingFields& ping) { - HTTP2_VLOG(1) << "OnPing: " << header << "; ping: " << ping; + QUICHE_VLOG(1) << "OnPing: " << header << "; ping: " << ping; if (wrapped_ != nullptr) { wrapped_->OnPing(header, ping); } @@ -374,7 +374,7 @@ void LoggingHttp2FrameDecoderListener::OnPingAck(const Http2FrameHeader& header, const Http2PingFields& ping) { - HTTP2_VLOG(1) << "OnPingAck: " << header << "; ping: " << ping; + QUICHE_VLOG(1) << "OnPingAck: " << header << "; ping: " << ping; if (wrapped_ != nullptr) { wrapped_->OnPingAck(header, ping); } @@ -382,7 +382,7 @@ void LoggingHttp2FrameDecoderListener::OnGoAwayStart( const Http2FrameHeader& header, const Http2GoAwayFields& goaway) { - HTTP2_VLOG(1) << "OnGoAwayStart: " << header << "; goaway: " << goaway; + QUICHE_VLOG(1) << "OnGoAwayStart: " << header << "; goaway: " << goaway; if (wrapped_ != nullptr) { wrapped_->OnGoAwayStart(header, goaway); } @@ -390,14 +390,14 @@ void LoggingHttp2FrameDecoderListener::OnGoAwayOpaqueData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; + QUICHE_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; if (wrapped_ != nullptr) { wrapped_->OnGoAwayOpaqueData(data, len); } } void LoggingHttp2FrameDecoderListener::OnGoAwayEnd() { - HTTP2_VLOG(1) << "OnGoAwayEnd"; + QUICHE_VLOG(1) << "OnGoAwayEnd"; if (wrapped_ != nullptr) { wrapped_->OnGoAwayEnd(); } @@ -405,7 +405,7 @@ void LoggingHttp2FrameDecoderListener::OnWindowUpdate( const Http2FrameHeader& header, uint32_t increment) { - HTTP2_VLOG(1) << "OnWindowUpdate: " << header << "; increment=" << increment; + QUICHE_VLOG(1) << "OnWindowUpdate: " << header << "; increment=" << increment; if (wrapped_ != nullptr) { wrapped_->OnWindowUpdate(header, increment); } @@ -413,9 +413,9 @@ void LoggingHttp2FrameDecoderListener::OnAltSvcStart( const Http2FrameHeader& header, size_t origin_length, size_t value_length) { - HTTP2_VLOG(1) << "OnAltSvcStart: " << header - << "; origin_length: " << origin_length - << "; value_length: " << value_length; + QUICHE_VLOG(1) << "OnAltSvcStart: " << header + << "; origin_length: " << origin_length + << "; value_length: " << value_length; if (wrapped_ != nullptr) { wrapped_->OnAltSvcStart(header, origin_length, value_length); } @@ -423,7 +423,7 @@ void LoggingHttp2FrameDecoderListener::OnAltSvcOriginData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnAltSvcOriginData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcOriginData: len=" << len; if (wrapped_ != nullptr) { wrapped_->OnAltSvcOriginData(data, len); } @@ -431,14 +431,14 @@ void LoggingHttp2FrameDecoderListener::OnAltSvcValueData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnAltSvcValueData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcValueData: len=" << len; if (wrapped_ != nullptr) { wrapped_->OnAltSvcValueData(data, len); } } void LoggingHttp2FrameDecoderListener::OnAltSvcEnd() { - HTTP2_VLOG(1) << "OnAltSvcEnd"; + QUICHE_VLOG(1) << "OnAltSvcEnd"; if (wrapped_ != nullptr) { wrapped_->OnAltSvcEnd(); } @@ -447,7 +447,7 @@ void LoggingHttp2FrameDecoderListener::OnPriorityUpdateStart( const Http2FrameHeader& header, const Http2PriorityUpdateFields& priority_update) { - HTTP2_VLOG(1) << "OnPriorityUpdateStart"; + QUICHE_VLOG(1) << "OnPriorityUpdateStart"; if (wrapped_ != nullptr) { wrapped_->OnPriorityUpdateStart(header, priority_update); } @@ -455,14 +455,14 @@ void LoggingHttp2FrameDecoderListener::OnPriorityUpdatePayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnPriorityUpdatePayload"; + QUICHE_VLOG(1) << "OnPriorityUpdatePayload"; if (wrapped_ != nullptr) { wrapped_->OnPriorityUpdatePayload(data, len); } } void LoggingHttp2FrameDecoderListener::OnPriorityUpdateEnd() { - HTTP2_VLOG(1) << "OnPriorityUpdateEnd"; + QUICHE_VLOG(1) << "OnPriorityUpdateEnd"; if (wrapped_ != nullptr) { wrapped_->OnPriorityUpdateEnd(); } @@ -470,7 +470,7 @@ void LoggingHttp2FrameDecoderListener::OnUnknownStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnUnknownStart: " << header; + QUICHE_VLOG(1) << "OnUnknownStart: " << header; if (wrapped_ != nullptr) { wrapped_->OnUnknownStart(header); } @@ -478,14 +478,14 @@ void LoggingHttp2FrameDecoderListener::OnUnknownPayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnUnknownPayload: len=" << len; + QUICHE_VLOG(1) << "OnUnknownPayload: len=" << len; if (wrapped_ != nullptr) { wrapped_->OnUnknownPayload(data, len); } } void LoggingHttp2FrameDecoderListener::OnUnknownEnd() { - HTTP2_VLOG(1) << "OnUnknownEnd"; + QUICHE_VLOG(1) << "OnUnknownEnd"; if (wrapped_ != nullptr) { wrapped_->OnUnknownEnd(); } @@ -493,8 +493,8 @@ void LoggingHttp2FrameDecoderListener::OnPaddingTooLong( const Http2FrameHeader& header, size_t missing_length) { - HTTP2_VLOG(1) << "OnPaddingTooLong: " << header - << "; missing_length: " << missing_length; + QUICHE_VLOG(1) << "OnPaddingTooLong: " << header + << "; missing_length: " << missing_length; if (wrapped_ != nullptr) { wrapped_->OnPaddingTooLong(header, missing_length); } @@ -502,7 +502,7 @@ void LoggingHttp2FrameDecoderListener::OnFrameSizeError( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; if (wrapped_ != nullptr) { wrapped_->OnFrameSizeError(header); }
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h index 836293e..86cb327 100644 --- a/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h +++ b/quiche/http2/decoder/http2_frame_decoder_listener_test_util.h
@@ -81,7 +81,7 @@ void EnsureNotAbstract() { FailingHttp2FrameDecoderListener instance; } }; -// HTTP2_VLOG's all the calls it receives, and forwards those calls to an +// QUICHE_VLOG's all the calls it receives, and forwards those calls to an // optional listener. class QUICHE_NO_EXPORT LoggingHttp2FrameDecoderListener : public Http2FrameDecoderListener {
diff --git a/quiche/http2/decoder/http2_frame_decoder_test.cc b/quiche/http2/decoder/http2_frame_decoder_test.cc index 783adb8..b05f7ae 100644 --- a/quiche/http2/decoder/http2_frame_decoder_test.cc +++ b/quiche/http2/decoder/http2_frame_decoder_test.cc
@@ -12,11 +12,11 @@ #include "absl/strings/string_view.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/platform/api/http2_flags.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector_listener.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionSuccess; @@ -35,7 +35,7 @@ class Http2FrameDecoderTest : public RandomDecoderTest { protected: DecodeStatus StartDecoding(DecodeBuffer* db) override { - HTTP2_DVLOG(2) << "StartDecoding, db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "StartDecoding, db->Remaining=" << db->Remaining(); collector_.Reset(); PrepareDecoder(); @@ -52,7 +52,7 @@ } DecodeStatus ResumeDecoding(DecodeBuffer* db) override { - HTTP2_DVLOG(2) << "ResumeDecoding, db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "ResumeDecoding, db->Remaining=" << db->Remaining(); DecodeStatus status = decoder_->DecodeFrame(db); if (status != DecodeStatus::kDecodeInProgress) { // Keep track of this so that a concrete test can verify that both fast
diff --git a/quiche/http2/decoder/http2_structure_decoder.cc b/quiche/http2/decoder/http2_structure_decoder.cc index 5065256..0569c98 100644 --- a/quiche/http2/decoder/http2_structure_decoder.cc +++ b/quiche/http2/decoder/http2_structure_decoder.cc
@@ -35,24 +35,24 @@ DecodeStatus Http2StructureDecoder::IncompleteStart(DecodeBuffer* db, uint32_t* remaining_payload, uint32_t target_size) { - HTTP2_DVLOG(1) << "IncompleteStart@" << this - << ": *remaining_payload=" << *remaining_payload - << "; target_size=" << target_size - << "; db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(1) << "IncompleteStart@" << this + << ": *remaining_payload=" << *remaining_payload + << "; target_size=" << target_size + << "; db->Remaining=" << db->Remaining(); *remaining_payload -= IncompleteStart(db, std::min(target_size, *remaining_payload)); if (*remaining_payload > 0 && db->Empty()) { return DecodeStatus::kDecodeInProgress; } - HTTP2_DVLOG(1) << "IncompleteStart: kDecodeError"; + QUICHE_DVLOG(1) << "IncompleteStart: kDecodeError"; return DecodeStatus::kDecodeError; } bool Http2StructureDecoder::ResumeFillingBuffer(DecodeBuffer* db, uint32_t target_size) { - HTTP2_DVLOG(2) << "ResumeFillingBuffer@" << this - << ": target_size=" << target_size << "; offset_=" << offset_ - << "; db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "ResumeFillingBuffer@" << this + << ": target_size=" << target_size << "; offset_=" << offset_ + << "; db->Remaining=" << db->Remaining(); if (target_size < offset_) { QUICHE_BUG(http2_bug_154_2) << "Already filled buffer_! target_size=" << target_size @@ -61,7 +61,7 @@ } const uint32_t needed = target_size - offset_; const uint32_t num_to_copy = db->MinLengthRemaining(needed); - HTTP2_DVLOG(2) << "ResumeFillingBuffer num_to_copy=" << num_to_copy; + QUICHE_DVLOG(2) << "ResumeFillingBuffer num_to_copy=" << num_to_copy; memcpy(&buffer_[offset_], db->cursor(), num_to_copy); db->AdvanceCursor(num_to_copy); offset_ += num_to_copy; @@ -71,10 +71,10 @@ bool Http2StructureDecoder::ResumeFillingBuffer(DecodeBuffer* db, uint32_t* remaining_payload, uint32_t target_size) { - HTTP2_DVLOG(2) << "ResumeFillingBuffer@" << this - << ": target_size=" << target_size << "; offset_=" << offset_ - << "; *remaining_payload=" << *remaining_payload - << "; db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "ResumeFillingBuffer@" << this + << ": target_size=" << target_size << "; offset_=" << offset_ + << "; *remaining_payload=" << *remaining_payload + << "; db->Remaining=" << db->Remaining(); if (target_size < offset_) { QUICHE_BUG(http2_bug_154_3) << "Already filled buffer_! target_size=" << target_size @@ -84,7 +84,7 @@ const uint32_t needed = target_size - offset_; const uint32_t num_to_copy = db->MinLengthRemaining(std::min(needed, *remaining_payload)); - HTTP2_DVLOG(2) << "ResumeFillingBuffer num_to_copy=" << num_to_copy; + QUICHE_DVLOG(2) << "ResumeFillingBuffer num_to_copy=" << num_to_copy; memcpy(&buffer_[offset_], db->cursor(), num_to_copy); db->AdvanceCursor(num_to_copy); offset_ += num_to_copy;
diff --git a/quiche/http2/decoder/http2_structure_decoder.h b/quiche/http2/decoder/http2_structure_decoder.h index 12a8abb..77d7fd2 100644 --- a/quiche/http2/decoder/http2_structure_decoder.h +++ b/quiche/http2/decoder/http2_structure_decoder.h
@@ -19,8 +19,8 @@ #include "quiche/http2/decoder/decode_http2_structures.h" #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace test { @@ -44,9 +44,9 @@ template <class S> bool Start(S* out, DecodeBuffer* db) { static_assert(S::EncodedSize() <= sizeof buffer_, "buffer_ is too small"); - HTTP2_DVLOG(2) << __func__ << "@" << this - << ": db->Remaining=" << db->Remaining() - << "; EncodedSize=" << S::EncodedSize(); + QUICHE_DVLOG(2) << __func__ << "@" << this + << ": db->Remaining=" << db->Remaining() + << "; EncodedSize=" << S::EncodedSize(); if (db->Remaining() >= S::EncodedSize()) { DoDecode(out, db); return true; @@ -57,12 +57,12 @@ template <class S> bool Resume(S* out, DecodeBuffer* db) { - HTTP2_DVLOG(2) << __func__ << "@" << this << ": offset_=" << offset_ - << "; db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << __func__ << "@" << this << ": offset_=" << offset_ + << "; db->Remaining=" << db->Remaining(); if (ResumeFillingBuffer(db, S::EncodedSize())) { // We have the whole thing now. - HTTP2_DVLOG(2) << __func__ << "@" << this << " offset_=" << offset_ - << " Ready to decode from buffer_."; + QUICHE_DVLOG(2) << __func__ << "@" << this << " offset_=" << offset_ + << " Ready to decode from buffer_."; DecodeBuffer buffer_db(buffer_, S::EncodedSize()); DoDecode(out, &buffer_db); return true; @@ -78,10 +78,10 @@ template <class S> DecodeStatus Start(S* out, DecodeBuffer* db, uint32_t* remaining_payload) { static_assert(S::EncodedSize() <= sizeof buffer_, "buffer_ is too small"); - HTTP2_DVLOG(2) << __func__ << "@" << this - << ": *remaining_payload=" << *remaining_payload - << "; db->Remaining=" << db->Remaining() - << "; EncodedSize=" << S::EncodedSize(); + QUICHE_DVLOG(2) << __func__ << "@" << this + << ": *remaining_payload=" << *remaining_payload + << "; db->Remaining=" << db->Remaining() + << "; EncodedSize=" << S::EncodedSize(); if (db->MinLengthRemaining(*remaining_payload) >= S::EncodedSize()) { DoDecode(out, db); *remaining_payload -= S::EncodedSize(); @@ -92,14 +92,14 @@ template <class S> bool Resume(S* out, DecodeBuffer* db, uint32_t* remaining_payload) { - HTTP2_DVLOG(3) << __func__ << "@" << this << ": offset_=" << offset_ - << "; *remaining_payload=" << *remaining_payload - << "; db->Remaining=" << db->Remaining() - << "; EncodedSize=" << S::EncodedSize(); + QUICHE_DVLOG(3) << __func__ << "@" << this << ": offset_=" << offset_ + << "; *remaining_payload=" << *remaining_payload + << "; db->Remaining=" << db->Remaining() + << "; EncodedSize=" << S::EncodedSize(); if (ResumeFillingBuffer(db, remaining_payload, S::EncodedSize())) { // We have the whole thing now. - HTTP2_DVLOG(2) << __func__ << "@" << this << ": offset_=" << offset_ - << "; Ready to decode from buffer_."; + QUICHE_DVLOG(2) << __func__ << "@" << this << ": offset_=" << offset_ + << "; Ready to decode from buffer_."; DecodeBuffer buffer_db(buffer_, S::EncodedSize()); DoDecode(out, &buffer_db); return true;
diff --git a/quiche/http2/decoder/http2_structure_decoder_test.cc b/quiche/http2/decoder/http2_structure_decoder_test.cc index e0fc9b6..a44a20f 100644 --- a/quiche/http2/decoder/http2_structure_decoder_test.cc +++ b/quiche/http2/decoder/http2_structure_decoder_test.cc
@@ -28,9 +28,9 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionSuccess; @@ -133,8 +133,8 @@ VERIFY_EQ(0u, incomplete_resume_count_); } if (expected != nullptr) { - HTTP2_DVLOG(1) << "DecodeLeadingStructure expected: " << *expected; - HTTP2_DVLOG(1) << "DecodeLeadingStructure actual: " << *structure_; + QUICHE_DVLOG(1) << "DecodeLeadingStructure expected: " << *expected; + QUICHE_DVLOG(1) << "DecodeLeadingStructure actual: " << *structure_; VERIFY_EQ(*expected, *structure_); } return AssertionSuccess();
diff --git a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc index f48277e..8602f70 100644 --- a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc
@@ -11,8 +11,8 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -38,8 +38,8 @@ DecodeStatus AltSvcPayloadDecoder::StartDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "AltSvcPayloadDecoder::StartDecodingPayload: " - << state->frame_header(); + QUICHE_DVLOG(2) << "AltSvcPayloadDecoder::StartDecodingPayload: " + << state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::ALTSVC, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); QUICHE_DCHECK_EQ(0, state->frame_header().flags); @@ -53,8 +53,8 @@ DecodeStatus AltSvcPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { const Http2FrameHeader& frame_header = state->frame_header(); - HTTP2_DVLOG(2) << "AltSvcPayloadDecoder::ResumeDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "AltSvcPayloadDecoder::ResumeDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::ALTSVC, frame_header.type); QUICHE_DCHECK_LE(state->remaining_payload(), frame_header.payload_length); QUICHE_DCHECK_LE(db->Remaining(), state->remaining_payload()); @@ -64,7 +64,7 @@ // see QUICHE_DCHECK_NE above. DecodeStatus status = DecodeStatus::kDecodeError; while (true) { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "AltSvcPayloadDecoder::ResumeDecodingPayload payload_state_=" << payload_state_; switch (payload_state_) { @@ -109,9 +109,9 @@ DecodeStatus AltSvcPayloadDecoder::DecodeStrings(FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "AltSvcPayloadDecoder::DecodeStrings remaining_payload=" - << state->remaining_payload() - << ", db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "AltSvcPayloadDecoder::DecodeStrings remaining_payload=" + << state->remaining_payload() + << ", db->Remaining=" << db->Remaining(); // Note that we don't explicitly keep track of exactly how far through the // origin; instead we compute it from how much is left of the original // payload length and the decoded total length of the origin.
diff --git a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc index 18b7253..db8a5e7 100644 --- a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder_test.cc
@@ -13,12 +13,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -40,29 +40,29 @@ struct Listener : public FramePartsCollector { void OnAltSvcStart(const Http2FrameHeader& header, size_t origin_length, size_t value_length) override { - HTTP2_VLOG(1) << "OnAltSvcStart header: " << header - << "; origin_length=" << origin_length - << "; value_length=" << value_length; + QUICHE_VLOG(1) << "OnAltSvcStart header: " << header + << "; origin_length=" << origin_length + << "; value_length=" << value_length; StartFrame(header)->OnAltSvcStart(header, origin_length, value_length); } void OnAltSvcOriginData(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnAltSvcOriginData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcOriginData: len=" << len; CurrentFrame()->OnAltSvcOriginData(data, len); } void OnAltSvcValueData(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnAltSvcValueData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcValueData: len=" << len; CurrentFrame()->OnAltSvcValueData(data, len); } void OnAltSvcEnd() override { - HTTP2_VLOG(1) << "OnAltSvcEnd"; + QUICHE_VLOG(1) << "OnAltSvcEnd"; EndFrame()->OnAltSvcEnd(); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } }; @@ -88,9 +88,9 @@ AltSvcPayloadLengthTests() : origin_length_(std::get<0>(GetParam())), value_length_(std::get<1>(GetParam())) { - HTTP2_VLOG(1) << "################ origin_length_=" << origin_length_ - << " value_length_=" << value_length_ - << " ################"; + QUICHE_VLOG(1) << "################ origin_length_=" << origin_length_ + << " value_length_=" << value_length_ + << " ################"; } const uint16_t origin_length_;
diff --git a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc index b6f3539..0ed64a9 100644 --- a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc
@@ -10,7 +10,7 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -19,8 +19,8 @@ const Http2FrameHeader& frame_header = state->frame_header(); const uint32_t total_length = frame_header.payload_length; - HTTP2_DVLOG(2) << "ContinuationPayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "ContinuationPayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::CONTINUATION, frame_header.type); QUICHE_DCHECK_LE(db->Remaining(), total_length); QUICHE_DCHECK_EQ(0, frame_header.flags & ~(Http2FrameFlag::END_HEADERS)); @@ -32,9 +32,9 @@ DecodeStatus ContinuationPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "ContinuationPayloadDecoder::ResumeDecodingPayload" - << " remaining_payload=" << state->remaining_payload() - << " db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "ContinuationPayloadDecoder::ResumeDecodingPayload" + << " remaining_payload=" << state->remaining_payload() + << " db->Remaining=" << db->Remaining(); QUICHE_DCHECK_EQ(Http2FrameType::CONTINUATION, state->frame_header().type); QUICHE_DCHECK_LE(state->remaining_payload(), state->frame_header().payload_length);
diff --git a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc index 33e0e33..44fea32 100644 --- a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc
@@ -13,10 +13,10 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -39,17 +39,17 @@ struct Listener : public FramePartsCollector { void OnContinuationStart(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnContinuationStart: " << header; + QUICHE_VLOG(1) << "OnContinuationStart: " << header; StartFrame(header)->OnContinuationStart(header); } void OnHpackFragment(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnHpackFragment: len=" << len; + QUICHE_VLOG(1) << "OnHpackFragment: len=" << len; CurrentFrame()->OnHpackFragment(data, len); } void OnContinuationEnd() override { - HTTP2_VLOG(1) << "OnContinuationEnd"; + QUICHE_VLOG(1) << "OnContinuationEnd"; EndFrame()->OnContinuationEnd(); } }; @@ -60,8 +60,8 @@ public ::testing::WithParamInterface<uint32_t> { protected: ContinuationPayloadDecoderTest() : length_(GetParam()) { - HTTP2_VLOG(1) << "################ length_=" << length_ - << " ################"; + QUICHE_VLOG(1) << "################ length_=" << length_ + << " ################"; } const uint32_t length_;
diff --git a/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc index 6561a48..e0c7ab0 100644 --- a/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc
@@ -11,8 +11,8 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -39,8 +39,8 @@ const Http2FrameHeader& frame_header = state->frame_header(); const uint32_t total_length = frame_header.payload_length; - HTTP2_DVLOG(2) << "DataPayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "DataPayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::DATA, frame_header.type); QUICHE_DCHECK_LE(db->Remaining(), total_length); QUICHE_DCHECK_EQ(0, frame_header.flags & ~(Http2FrameFlag::END_STREAM | @@ -50,11 +50,11 @@ // the decode buffer. TO BE SEEN if that is true. It certainly requires that // the transport buffers be large (e.g. >> 16KB typically). // TODO(jamessynge) Add counters. - HTTP2_DVLOG(2) << "StartDecodingPayload total_length=" << total_length; + QUICHE_DVLOG(2) << "StartDecodingPayload total_length=" << total_length; if (!frame_header.IsPadded()) { - HTTP2_DVLOG(2) << "StartDecodingPayload !IsPadded"; + QUICHE_DVLOG(2) << "StartDecodingPayload !IsPadded"; if (db->Remaining() == total_length) { - HTTP2_DVLOG(2) << "StartDecodingPayload all present"; + QUICHE_DVLOG(2) << "StartDecodingPayload all present"; // Note that we don't cache the listener field so that the callee can // replace it if the frame is bad. // If this case is common enough, consider combining the 3 callbacks @@ -78,8 +78,8 @@ DecodeStatus DataPayloadDecoder::ResumeDecodingPayload(FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "DataPayloadDecoder::ResumeDecodingPayload payload_state_=" - << payload_state_; + QUICHE_DVLOG(2) << "DataPayloadDecoder::ResumeDecodingPayload payload_state_=" + << payload_state_; const Http2FrameHeader& frame_header = state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::DATA, frame_header.type); QUICHE_DCHECK_LE(state->remaining_payload_and_padding(),
diff --git a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc index 5bc9941..2a9443b 100644 --- a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
@@ -13,12 +13,12 @@ #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h" @@ -42,34 +42,34 @@ struct Listener : public FramePartsCollector { void OnDataStart(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnDataStart: " << header; + QUICHE_VLOG(1) << "OnDataStart: " << header; StartFrame(header)->OnDataStart(header); } void OnDataPayload(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnDataPayload: len=" << len; + QUICHE_VLOG(1) << "OnDataPayload: len=" << len; CurrentFrame()->OnDataPayload(data, len); } void OnDataEnd() override { - HTTP2_VLOG(1) << "OnDataEnd"; + QUICHE_VLOG(1) << "OnDataEnd"; EndFrame()->OnDataEnd(); } void OnPadLength(size_t pad_length) override { - HTTP2_VLOG(1) << "OnPadLength: " << pad_length; + QUICHE_VLOG(1) << "OnPadLength: " << pad_length; CurrentFrame()->OnPadLength(pad_length); } void OnPadding(const char* padding, size_t skipped_length) override { - HTTP2_VLOG(1) << "OnPadding: " << skipped_length; + QUICHE_VLOG(1) << "OnPadding: " << skipped_length; CurrentFrame()->OnPadding(padding, skipped_length); } void OnPaddingTooLong(const Http2FrameHeader& header, size_t missing_length) override { - HTTP2_VLOG(1) << "OnPaddingTooLong: " << header - << " missing_length: " << missing_length; + QUICHE_VLOG(1) << "OnPaddingTooLong: " << header + << " missing_length: " << missing_length; EndFrame()->OnPaddingTooLong(header, missing_length); } };
diff --git a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc index f69de71..fca781c 100644 --- a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc
@@ -11,8 +11,8 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -38,8 +38,8 @@ DecodeStatus GoAwayPayloadDecoder::StartDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "GoAwayPayloadDecoder::StartDecodingPayload: " - << state->frame_header(); + QUICHE_DVLOG(2) << "GoAwayPayloadDecoder::StartDecodingPayload: " + << state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::GOAWAY, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); QUICHE_DCHECK_EQ(0, state->frame_header().flags); @@ -51,7 +51,7 @@ DecodeStatus GoAwayPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "GoAwayPayloadDecoder::ResumeDecodingPayload: remaining_payload=" << state->remaining_payload() << ", db->Remaining=" << db->Remaining(); @@ -66,7 +66,7 @@ DecodeStatus status = DecodeStatus::kDecodeError; size_t avail; while (true) { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "GoAwayPayloadDecoder::ResumeDecodingPayload payload_state_=" << payload_state_; switch (payload_state_) {
diff --git a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc index 6bbb527..451ad39 100644 --- a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder_test.cc
@@ -12,12 +12,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -37,23 +37,23 @@ struct Listener : public FramePartsCollector { void OnGoAwayStart(const Http2FrameHeader& header, const Http2GoAwayFields& goaway) override { - HTTP2_VLOG(1) << "OnGoAwayStart header: " << header - << "; goaway: " << goaway; + QUICHE_VLOG(1) << "OnGoAwayStart header: " << header + << "; goaway: " << goaway; StartFrame(header)->OnGoAwayStart(header, goaway); } void OnGoAwayOpaqueData(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; + QUICHE_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; CurrentFrame()->OnGoAwayOpaqueData(data, len); } void OnGoAwayEnd() override { - HTTP2_VLOG(1) << "OnGoAwayEnd"; + QUICHE_VLOG(1) << "OnGoAwayEnd"; EndFrame()->OnGoAwayEnd(); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } }; @@ -78,8 +78,8 @@ public ::testing::WithParamInterface<uint32_t> { protected: GoAwayOpaqueDataLengthTests() : length_(GetParam()) { - HTTP2_VLOG(1) << "################ length_=" << length_ - << " ################"; + QUICHE_VLOG(1) << "################ length_=" << length_ + << " ################"; } const uint32_t length_;
diff --git a/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc index 933eae8..e3517ff 100644 --- a/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc
@@ -11,8 +11,8 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -43,8 +43,8 @@ const Http2FrameHeader& frame_header = state->frame_header(); const uint32_t total_length = frame_header.payload_length; - HTTP2_DVLOG(2) << "HeadersPayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "HeadersPayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::HEADERS, frame_header.type); QUICHE_DCHECK_LE(db->Remaining(), total_length); @@ -68,9 +68,9 @@ // set then we can decode faster. const auto payload_flags = Http2FrameFlag::PADDED | Http2FrameFlag::PRIORITY; if (!frame_header.HasAnyFlags(payload_flags)) { - HTTP2_DVLOG(2) << "StartDecodingPayload !IsPadded && !HasPriority"; + QUICHE_DVLOG(2) << "StartDecodingPayload !IsPadded && !HasPriority"; if (db->Remaining() == total_length) { - HTTP2_DVLOG(2) << "StartDecodingPayload all present"; + QUICHE_DVLOG(2) << "StartDecodingPayload all present"; // Note that we don't cache the listener field so that the callee can // replace it if the frame is bad. // If this case is common enough, consider combining the 3 callbacks @@ -97,9 +97,9 @@ DecodeStatus HeadersPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "HeadersPayloadDecoder::ResumeDecodingPayload " - << "remaining_payload=" << state->remaining_payload() - << "; db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "HeadersPayloadDecoder::ResumeDecodingPayload " + << "remaining_payload=" << state->remaining_payload() + << "; db->Remaining=" << db->Remaining(); const Http2FrameHeader& frame_header = state->frame_header(); @@ -110,7 +110,7 @@ DecodeStatus status; size_t avail; while (true) { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "HeadersPayloadDecoder::ResumeDecodingPayload payload_state_=" << payload_state_; switch (payload_state_) {
diff --git a/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc index ed2959e..b4b8fbd 100644 --- a/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/headers_payload_decoder_test.cc
@@ -12,12 +12,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -48,44 +48,44 @@ // via the public methods of FramePartsCollector. struct Listener : public FramePartsCollector { void OnHeadersStart(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnHeadersStart: " << header; + QUICHE_VLOG(1) << "OnHeadersStart: " << header; StartFrame(header)->OnHeadersStart(header); } void OnHeadersPriority(const Http2PriorityFields& priority) override { - HTTP2_VLOG(1) << "OnHeadersPriority: " << priority; + QUICHE_VLOG(1) << "OnHeadersPriority: " << priority; CurrentFrame()->OnHeadersPriority(priority); } void OnHpackFragment(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnHpackFragment: len=" << len; + QUICHE_VLOG(1) << "OnHpackFragment: len=" << len; CurrentFrame()->OnHpackFragment(data, len); } void OnHeadersEnd() override { - HTTP2_VLOG(1) << "OnHeadersEnd"; + QUICHE_VLOG(1) << "OnHeadersEnd"; EndFrame()->OnHeadersEnd(); } void OnPadLength(size_t pad_length) override { - HTTP2_VLOG(1) << "OnPadLength: " << pad_length; + QUICHE_VLOG(1) << "OnPadLength: " << pad_length; CurrentFrame()->OnPadLength(pad_length); } void OnPadding(const char* padding, size_t skipped_length) override { - HTTP2_VLOG(1) << "OnPadding: " << skipped_length; + QUICHE_VLOG(1) << "OnPadding: " << skipped_length; CurrentFrame()->OnPadding(padding, skipped_length); } void OnPaddingTooLong(const Http2FrameHeader& header, size_t missing_length) override { - HTTP2_VLOG(1) << "OnPaddingTooLong: " << header - << "; missing_length: " << missing_length; + QUICHE_VLOG(1) << "OnPaddingTooLong: " << header + << "; missing_length: " << missing_length; FrameError(header)->OnPaddingTooLong(header, missing_length); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } }; @@ -101,8 +101,8 @@ // PRIORITY flag set. TEST_P(HeadersPayloadDecoderTest, VariousHpackPayloadSizes) { for (size_t hpack_size : {0, 1, 2, 3, 255, 256, 1024}) { - HTTP2_LOG(INFO) << "########### hpack_size = " << hpack_size - << " ###########"; + QUICHE_LOG(INFO) << "########### hpack_size = " << hpack_size + << " ###########"; Http2PriorityFields priority(RandStreamId(), 1 + Random().Rand8(), Random().OneIn(2));
diff --git a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc b/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc index 83062b5..8fcd2b0 100644 --- a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc +++ b/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc
@@ -19,7 +19,7 @@ } DecodeStatus PayloadDecoderBaseTest::StartDecoding(DecodeBuffer* db) { - HTTP2_DVLOG(2) << "StartDecoding, db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "StartDecoding, db->Remaining=" << db->Remaining(); // Make sure sub-class has set frame_header_ so that we can inject it // into the payload decoder below. if (!frame_header_is_set_) { @@ -64,7 +64,7 @@ } DecodeStatus PayloadDecoderBaseTest::ResumeDecoding(DecodeBuffer* db) { - HTTP2_DVLOG(2) << "ResumeDecoding, db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "ResumeDecoding, db->Remaining=" << db->Remaining(); DecodeStatus status = ResumeDecodingPayload(db); if (status != DecodeStatus::kDecodeInProgress) { // Keep track of this so that a concrete test can verify that both fast
diff --git a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h b/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h index 5f59b76..da84571 100644 --- a/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h +++ b/quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h
@@ -19,11 +19,11 @@ #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_constants_test_util.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { @@ -56,7 +56,7 @@ void set_frame_header(const Http2FrameHeader& header) { EXPECT_EQ(0, InvalidFlagMaskForFrameType(header.type) & header.flags); if (!frame_header_is_set_ || frame_header_ != header) { - HTTP2_VLOG(2) << "set_frame_header: " << frame_header_; + QUICHE_VLOG(2) << "set_frame_header: " << frame_header_; } frame_header_ = header; frame_header_is_set_ = true; @@ -173,14 +173,15 @@ // Start decoding the payload. DecodeStatus StartDecodingPayload(DecodeBuffer* db) override { - HTTP2_DVLOG(2) << "StartDecodingPayload, db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "StartDecodingPayload, db->Remaining=" + << db->Remaining(); return payload_decoder_->StartDecodingPayload(mutable_state(), db); } // Resume decoding the payload. DecodeStatus ResumeDecodingPayload(DecodeBuffer* db) override { - HTTP2_DVLOG(2) << "ResumeDecodingPayload, db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(2) << "ResumeDecodingPayload, db->Remaining=" + << db->Remaining(); return payload_decoder_->ResumeDecodingPayload(mutable_state(), db); } @@ -218,8 +219,8 @@ validator = [header, validator, this]( const DecodeBuffer& input, DecodeStatus status) -> ::testing::AssertionResult { - HTTP2_DVLOG(2) << "VerifyDetectsFrameSizeError validator; status=" - << status << "; input.Remaining=" << input.Remaining(); + QUICHE_DVLOG(2) << "VerifyDetectsFrameSizeError validator; status=" + << status << "; input.Remaining=" << input.Remaining(); VERIFY_EQ(DecodeStatus::kDecodeError, status); VERIFY_FALSE(listener_.IsInProgress()); VERIFY_EQ(1u, listener_.size()); @@ -272,7 +273,7 @@ if (approve_size != nullptr && !approve_size(real_payload_size)) { continue; } - HTTP2_VLOG(1) << "real_payload_size=" << real_payload_size; + QUICHE_VLOG(1) << "real_payload_size=" << real_payload_size; uint8_t flags = required_flags | RandFlags(); Http2FrameBuilder fb; if (total_pad_length > 0) { @@ -331,7 +332,7 @@ typedef typename Base::Validator Validator; AbstractPaddablePayloadDecoderTest() : total_pad_length_(GetParam()) { - HTTP2_LOG(INFO) << "total_pad_length_ = " << total_pad_length_; + QUICHE_LOG(INFO) << "total_pad_length_ = " << total_pad_length_; } // Note that total_pad_length_ includes the size of the Pad Length field, @@ -408,12 +409,12 @@ if (IsPadded()) { fb.AppendUInt8(pad_length()); fb.AppendZeroes(pad_length()); - HTTP2_VLOG(1) << "fb.size=" << fb.size(); + QUICHE_VLOG(1) << "fb.size=" << fb.size(); // Pick a random length for the payload that is shorter than neccesary. payload_length = Random().Uniform(fb.size()); } - HTTP2_VLOG(1) << "payload_length=" << payload_length; + QUICHE_VLOG(1) << "payload_length=" << payload_length; std::string payload = fb.buffer().substr(0, payload_length); // The missing length is the amount we cut off the end, unless @@ -421,7 +422,7 @@ // byte, the Pad Length field, is missing. size_t missing_length = payload_length == 0 ? 1 : fb.size() - payload_length; - HTTP2_VLOG(1) << "missing_length=" << missing_length; + QUICHE_VLOG(1) << "missing_length=" << missing_length; const Http2FrameHeader header(payload_length, DecoderPeer::FrameType(), flags, RandStreamId());
diff --git a/quiche/http2/decoder/payload_decoders/ping_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/ping_payload_decoder.cc index 2f9408a..c700ac2 100644 --- a/quiche/http2/decoder/payload_decoders/ping_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/ping_payload_decoder.cc
@@ -6,7 +6,7 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace { @@ -18,8 +18,8 @@ const Http2FrameHeader& frame_header = state->frame_header(); const uint32_t total_length = frame_header.payload_length; - HTTP2_DVLOG(2) << "PingPayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "PingPayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::PING, frame_header.type); QUICHE_DCHECK_LE(db->Remaining(), total_length); QUICHE_DCHECK_EQ(0, frame_header.flags & ~(Http2FrameFlag::ACK)); @@ -51,8 +51,8 @@ DecodeStatus PingPayloadDecoder::ResumeDecodingPayload(FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "ResumeDecodingPayload: remaining_payload=" - << state->remaining_payload(); + QUICHE_DVLOG(2) << "ResumeDecodingPayload: remaining_payload=" + << state->remaining_payload(); QUICHE_DCHECK_EQ(Http2FrameType::PING, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); return HandleStatus( @@ -61,8 +61,8 @@ DecodeStatus PingPayloadDecoder::HandleStatus(FrameDecoderState* state, DecodeStatus status) { - HTTP2_DVLOG(2) << "HandleStatus: status=" << status - << "; remaining_payload=" << state->remaining_payload(); + QUICHE_DVLOG(2) << "HandleStatus: status=" << status + << "; remaining_payload=" << state->remaining_payload(); if (status == DecodeStatus::kDecodeDone) { if (state->remaining_payload() == 0) { const Http2FrameHeader& frame_header = state->frame_header();
diff --git a/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc index 74c133a..33ab9c9 100644 --- a/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
@@ -10,12 +10,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -35,18 +35,18 @@ struct Listener : public FramePartsCollector { void OnPing(const Http2FrameHeader& header, const Http2PingFields& ping) override { - HTTP2_VLOG(1) << "OnPing: " << header << "; " << ping; + QUICHE_VLOG(1) << "OnPing: " << header << "; " << ping; StartAndEndFrame(header)->OnPing(header, ping); } void OnPingAck(const Http2FrameHeader& header, const Http2PingFields& ping) override { - HTTP2_VLOG(1) << "OnPingAck: " << header << "; " << ping; + QUICHE_VLOG(1) << "OnPingAck: " << header << "; " << ping; StartAndEndFrame(header)->OnPingAck(header, ping); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } };
diff --git a/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc index 191ba6c..1a5a57b 100644 --- a/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc
@@ -8,14 +8,14 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { DecodeStatus PriorityPayloadDecoder::StartDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "PriorityPayloadDecoder::StartDecodingPayload: " - << state->frame_header(); + QUICHE_DVLOG(2) << "PriorityPayloadDecoder::StartDecodingPayload: " + << state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::PRIORITY, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); // PRIORITY frames have no flags. @@ -27,9 +27,9 @@ DecodeStatus PriorityPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "PriorityPayloadDecoder::ResumeDecodingPayload" - << " remaining_payload=" << state->remaining_payload() - << " db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "PriorityPayloadDecoder::ResumeDecodingPayload" + << " remaining_payload=" << state->remaining_payload() + << " db->Remaining=" << db->Remaining(); QUICHE_DCHECK_EQ(Http2FrameType::PRIORITY, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); return HandleStatus(
diff --git a/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc index 58e32df..558e542 100644 --- a/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/priority_payload_decoder_test.cc
@@ -10,12 +10,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -37,12 +37,12 @@ struct Listener : public FramePartsCollector { void OnPriorityFrame(const Http2FrameHeader& header, const Http2PriorityFields& priority_fields) override { - HTTP2_VLOG(1) << "OnPriority: " << header << "; " << priority_fields; + QUICHE_VLOG(1) << "OnPriority: " << header << "; " << priority_fields; StartAndEndFrame(header)->OnPriorityFrame(header, priority_fields); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } };
diff --git a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc index a776826..2c74251 100644 --- a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc
@@ -11,8 +11,8 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -38,8 +38,8 @@ DecodeStatus PriorityUpdatePayloadDecoder::StartDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "PriorityUpdatePayloadDecoder::StartDecodingPayload: " - << state->frame_header(); + QUICHE_DVLOG(2) << "PriorityUpdatePayloadDecoder::StartDecodingPayload: " + << state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::PRIORITY_UPDATE, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); QUICHE_DCHECK_EQ(0, state->frame_header().flags); @@ -51,10 +51,10 @@ DecodeStatus PriorityUpdatePayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "PriorityUpdatePayloadDecoder::ResumeDecodingPayload: " - "remaining_payload=" - << state->remaining_payload() - << ", db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "PriorityUpdatePayloadDecoder::ResumeDecodingPayload: " + "remaining_payload=" + << state->remaining_payload() + << ", db->Remaining=" << db->Remaining(); const Http2FrameHeader& frame_header = state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::PRIORITY_UPDATE, frame_header.type); @@ -67,7 +67,7 @@ DecodeStatus status = DecodeStatus::kDecodeError; size_t avail; while (true) { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "PriorityUpdatePayloadDecoder::ResumeDecodingPayload payload_state_=" << payload_state_; switch (payload_state_) {
diff --git a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc index aa16912..0ed2a59 100644 --- a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder_test.cc
@@ -12,12 +12,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -40,23 +40,23 @@ void OnPriorityUpdateStart( const Http2FrameHeader& header, const Http2PriorityUpdateFields& priority_update) override { - HTTP2_VLOG(1) << "OnPriorityUpdateStart header: " << header - << "; priority_update: " << priority_update; + QUICHE_VLOG(1) << "OnPriorityUpdateStart header: " << header + << "; priority_update: " << priority_update; StartFrame(header)->OnPriorityUpdateStart(header, priority_update); } void OnPriorityUpdatePayload(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnPriorityUpdatePayload: len=" << len; + QUICHE_VLOG(1) << "OnPriorityUpdatePayload: len=" << len; CurrentFrame()->OnPriorityUpdatePayload(data, len); } void OnPriorityUpdateEnd() override { - HTTP2_VLOG(1) << "OnPriorityUpdateEnd"; + QUICHE_VLOG(1) << "OnPriorityUpdateEnd"; EndFrame()->OnPriorityUpdateEnd(); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } }; @@ -84,8 +84,8 @@ public ::testing::WithParamInterface<uint32_t> { protected: PriorityUpdatePayloadLengthTests() : length_(GetParam()) { - HTTP2_VLOG(1) << "################ length_=" << length_ - << " ################"; + QUICHE_VLOG(1) << "################ length_=" << length_ + << " ################"; } const uint32_t length_;
diff --git a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc index 7ba81b0..50a403e 100644 --- a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc
@@ -11,8 +11,8 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -40,8 +40,8 @@ const Http2FrameHeader& frame_header = state->frame_header(); const uint32_t total_length = frame_header.payload_length; - HTTP2_DVLOG(2) << "PushPromisePayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "PushPromisePayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::PUSH_PROMISE, frame_header.type); QUICHE_DCHECK_LE(db->Remaining(), total_length); @@ -63,9 +63,9 @@ DecodeStatus PushPromisePayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "UnknownPayloadDecoder::ResumeDecodingPayload" - << " remaining_payload=" << state->remaining_payload() - << " db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "UnknownPayloadDecoder::ResumeDecodingPayload" + << " remaining_payload=" << state->remaining_payload() + << " db->Remaining=" << db->Remaining(); const Http2FrameHeader& frame_header = state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::PUSH_PROMISE, frame_header.type); @@ -74,7 +74,7 @@ DecodeStatus status; while (true) { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "PushPromisePayloadDecoder::ResumeDecodingPayload payload_state_=" << payload_state_; switch (payload_state_) {
diff --git a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc index d0e3a30..e8806de 100644 --- a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder_test.cc
@@ -12,12 +12,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -47,38 +47,38 @@ void OnPushPromiseStart(const Http2FrameHeader& header, const Http2PushPromiseFields& promise, size_t total_padding_length) override { - HTTP2_VLOG(1) << "OnPushPromiseStart header: " << header - << " promise: " << promise - << " total_padding_length: " << total_padding_length; + QUICHE_VLOG(1) << "OnPushPromiseStart header: " << header + << " promise: " << promise + << " total_padding_length: " << total_padding_length; EXPECT_EQ(Http2FrameType::PUSH_PROMISE, header.type); StartFrame(header)->OnPushPromiseStart(header, promise, total_padding_length); } void OnHpackFragment(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnHpackFragment: len=" << len; + QUICHE_VLOG(1) << "OnHpackFragment: len=" << len; CurrentFrame()->OnHpackFragment(data, len); } void OnPushPromiseEnd() override { - HTTP2_VLOG(1) << "OnPushPromiseEnd"; + QUICHE_VLOG(1) << "OnPushPromiseEnd"; EndFrame()->OnPushPromiseEnd(); } void OnPadding(const char* padding, size_t skipped_length) override { - HTTP2_VLOG(1) << "OnPadding: " << skipped_length; + QUICHE_VLOG(1) << "OnPadding: " << skipped_length; CurrentFrame()->OnPadding(padding, skipped_length); } void OnPaddingTooLong(const Http2FrameHeader& header, size_t missing_length) override { - HTTP2_VLOG(1) << "OnPaddingTooLong: " << header - << "; missing_length: " << missing_length; + QUICHE_VLOG(1) << "OnPaddingTooLong: " << header + << "; missing_length: " << missing_length; FrameError(header)->OnPaddingTooLong(header, missing_length); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } }; @@ -95,8 +95,8 @@ // (fake) HPACK payload. TEST_P(PushPromisePayloadDecoderTest, VariousHpackPayloadSizes) { for (size_t hpack_size : {0, 1, 2, 3, 255, 256, 1024}) { - HTTP2_LOG(INFO) << "########### hpack_size = " << hpack_size - << " ###########"; + QUICHE_LOG(INFO) << "########### hpack_size = " << hpack_size + << " ###########"; Reset(); std::string hpack_payload = Random().RandString(hpack_size); Http2PushPromiseFields push_promise{RandStreamId()};
diff --git a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc index bb2e510..27d410c 100644 --- a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc
@@ -8,14 +8,14 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { DecodeStatus RstStreamPayloadDecoder::StartDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "RstStreamPayloadDecoder::StartDecodingPayload: " - << state->frame_header(); + QUICHE_DVLOG(2) << "RstStreamPayloadDecoder::StartDecodingPayload: " + << state->frame_header(); QUICHE_DCHECK_EQ(Http2FrameType::RST_STREAM, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); // RST_STREAM has no flags. @@ -27,9 +27,9 @@ DecodeStatus RstStreamPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "RstStreamPayloadDecoder::ResumeDecodingPayload" - << " remaining_payload=" << state->remaining_payload() - << " db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "RstStreamPayloadDecoder::ResumeDecodingPayload" + << " remaining_payload=" << state->remaining_payload() + << " db->Remaining=" << db->Remaining(); QUICHE_DCHECK_EQ(Http2FrameType::RST_STREAM, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); return HandleStatus( @@ -38,8 +38,8 @@ DecodeStatus RstStreamPayloadDecoder::HandleStatus(FrameDecoderState* state, DecodeStatus status) { - HTTP2_DVLOG(2) << "HandleStatus: status=" << status - << "; remaining_payload=" << state->remaining_payload(); + QUICHE_DVLOG(2) << "HandleStatus: status=" << status + << "; remaining_payload=" << state->remaining_payload(); if (status == DecodeStatus::kDecodeDone) { if (state->remaining_payload() == 0) { state->listener()->OnRstStream(state->frame_header(),
diff --git a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc index 42f9393..b4bd192 100644 --- a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder_test.cc
@@ -11,12 +11,12 @@ #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_constants_test_util.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -38,12 +38,13 @@ struct Listener : public FramePartsCollector { void OnRstStream(const Http2FrameHeader& header, Http2ErrorCode error_code) override { - HTTP2_VLOG(1) << "OnRstStream: " << header << "; error_code=" << error_code; + QUICHE_VLOG(1) << "OnRstStream: " << header + << "; error_code=" << error_code; StartAndEndFrame(header)->OnRstStream(header, error_code); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } };
diff --git a/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc index cf0905e..0ba328f 100644 --- a/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc
@@ -8,7 +8,7 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -17,8 +17,8 @@ const Http2FrameHeader& frame_header = state->frame_header(); const uint32_t total_length = frame_header.payload_length; - HTTP2_DVLOG(2) << "SettingsPayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "SettingsPayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::SETTINGS, frame_header.type); QUICHE_DCHECK_LE(db->Remaining(), total_length); QUICHE_DCHECK_EQ(0, frame_header.flags & ~(Http2FrameFlag::ACK)); @@ -40,9 +40,9 @@ DecodeStatus SettingsPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "SettingsPayloadDecoder::ResumeDecodingPayload" - << " remaining_payload=" << state->remaining_payload() - << " db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "SettingsPayloadDecoder::ResumeDecodingPayload" + << " remaining_payload=" << state->remaining_payload() + << " db->Remaining=" << db->Remaining(); QUICHE_DCHECK_EQ(Http2FrameType::SETTINGS, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); @@ -57,9 +57,9 @@ DecodeStatus SettingsPayloadDecoder::StartDecodingSettings( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "SettingsPayloadDecoder::StartDecodingSettings" - << " remaining_payload=" << state->remaining_payload() - << " db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "SettingsPayloadDecoder::StartDecodingSettings" + << " remaining_payload=" << state->remaining_payload() + << " db->Remaining=" << db->Remaining(); while (state->remaining_payload() > 0) { DecodeStatus status = state->StartDecodingStructureInPayload(&setting_fields_, db); @@ -69,9 +69,9 @@ } return HandleNotDone(state, db, status); } - HTTP2_DVLOG(2) << "LEAVING SettingsPayloadDecoder::StartDecodingSettings" - << "\n\tdb->Remaining=" << db->Remaining() - << "\n\t remaining_payload=" << state->remaining_payload(); + QUICHE_DVLOG(2) << "LEAVING SettingsPayloadDecoder::StartDecodingSettings" + << "\n\tdb->Remaining=" << db->Remaining() + << "\n\t remaining_payload=" << state->remaining_payload(); state->listener()->OnSettingsEnd(); return DecodeStatus::kDecodeDone; }
diff --git a/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc index 7c53cc7..1c93864 100644 --- a/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/settings_payload_decoder_test.cc
@@ -13,12 +13,12 @@ #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_constants_test_util.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -41,29 +41,29 @@ struct Listener : public FramePartsCollector { void OnSettingsStart(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnSettingsStart: " << header; + QUICHE_VLOG(1) << "OnSettingsStart: " << header; EXPECT_EQ(Http2FrameType::SETTINGS, header.type) << header; EXPECT_EQ(Http2FrameFlag(), header.flags) << header; StartFrame(header)->OnSettingsStart(header); } void OnSetting(const Http2SettingFields& setting_fields) override { - HTTP2_VLOG(1) << "Http2SettingFields: setting_fields=" << setting_fields; + QUICHE_VLOG(1) << "Http2SettingFields: setting_fields=" << setting_fields; CurrentFrame()->OnSetting(setting_fields); } void OnSettingsEnd() override { - HTTP2_VLOG(1) << "OnSettingsEnd"; + QUICHE_VLOG(1) << "OnSettingsEnd"; EndFrame()->OnSettingsEnd(); } void OnSettingsAck(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnSettingsAck: " << header; + QUICHE_VLOG(1) << "OnSettingsAck: " << header; StartAndEndFrame(header)->OnSettingsAck(header); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } };
diff --git a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc index f61d47d..bb8dae7 100644 --- a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc
@@ -10,7 +10,7 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -18,8 +18,8 @@ FrameDecoderState* state, DecodeBuffer* db) { const Http2FrameHeader& frame_header = state->frame_header(); - HTTP2_DVLOG(2) << "UnknownPayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "UnknownPayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK(!IsSupportedHttp2FrameType(frame_header.type)) << frame_header; QUICHE_DCHECK_LE(db->Remaining(), frame_header.payload_length); @@ -30,9 +30,9 @@ DecodeStatus UnknownPayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "UnknownPayloadDecoder::ResumeDecodingPayload " - << "remaining_payload=" << state->remaining_payload() - << "; db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "UnknownPayloadDecoder::ResumeDecodingPayload " + << "remaining_payload=" << state->remaining_payload() + << "; db->Remaining=" << db->Remaining(); QUICHE_DCHECK(!IsSupportedHttp2FrameType(state->frame_header().type)) << state->frame_header(); QUICHE_DCHECK_LE(state->remaining_payload(),
diff --git a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc index 5651983..fccddeb 100644 --- a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc
@@ -13,11 +13,11 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -41,17 +41,17 @@ struct Listener : public FramePartsCollector { void OnUnknownStart(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnUnknownStart: " << header; + QUICHE_VLOG(1) << "OnUnknownStart: " << header; StartFrame(header)->OnUnknownStart(header); } void OnUnknownPayload(const char* data, size_t len) override { - HTTP2_VLOG(1) << "OnUnknownPayload: len=" << len; + QUICHE_VLOG(1) << "OnUnknownPayload: len=" << len; CurrentFrame()->OnUnknownPayload(data, len); } void OnUnknownEnd() override { - HTTP2_VLOG(1) << "OnUnknownEnd"; + QUICHE_VLOG(1) << "OnUnknownEnd"; EndFrame()->OnUnknownEnd(); } }; @@ -65,8 +65,8 @@ public ::testing::WithParamInterface<uint32_t> { protected: UnknownPayloadDecoderTest() : length_(GetParam()) { - HTTP2_VLOG(1) << "################ length_=" << length_ - << " ################"; + QUICHE_VLOG(1) << "################ length_=" << length_ + << " ################"; // Each test case will choose a random frame type that isn't supported. do {
diff --git a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc index cad7ef5..4174df8 100644 --- a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc +++ b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc
@@ -9,7 +9,7 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -18,8 +18,8 @@ const Http2FrameHeader& frame_header = state->frame_header(); const uint32_t total_length = frame_header.payload_length; - HTTP2_DVLOG(2) << "WindowUpdatePayloadDecoder::StartDecodingPayload: " - << frame_header; + QUICHE_DVLOG(2) << "WindowUpdatePayloadDecoder::StartDecodingPayload: " + << frame_header; QUICHE_DCHECK_EQ(Http2FrameType::WINDOW_UPDATE, frame_header.type); QUICHE_DCHECK_LE(db->Remaining(), total_length); @@ -43,9 +43,9 @@ DecodeStatus WindowUpdatePayloadDecoder::ResumeDecodingPayload( FrameDecoderState* state, DecodeBuffer* db) { - HTTP2_DVLOG(2) << "ResumeDecodingPayload: remaining_payload=" - << state->remaining_payload() - << "; db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(2) << "ResumeDecodingPayload: remaining_payload=" + << state->remaining_payload() + << "; db->Remaining=" << db->Remaining(); QUICHE_DCHECK_EQ(Http2FrameType::WINDOW_UPDATE, state->frame_header().type); QUICHE_DCHECK_LE(db->Remaining(), state->frame_header().payload_length); return HandleStatus(state, state->ResumeDecodingStructureInPayload( @@ -54,8 +54,8 @@ DecodeStatus WindowUpdatePayloadDecoder::HandleStatus(FrameDecoderState* state, DecodeStatus status) { - HTTP2_DVLOG(2) << "HandleStatus: status=" << status - << "; remaining_payload=" << state->remaining_payload(); + QUICHE_DVLOG(2) << "HandleStatus: status=" << status + << "; remaining_payload=" << state->remaining_payload(); if (status == DecodeStatus::kDecodeDone) { if (state->remaining_payload() == 0) { state->listener()->OnWindowUpdate(
diff --git a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc index 3b339a4..03bb862 100644 --- a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder_test.cc
@@ -10,12 +10,12 @@ #include "quiche/http2/decoder/payload_decoders/payload_decoder_base_test_util.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -37,14 +37,14 @@ struct Listener : public FramePartsCollector { void OnWindowUpdate(const Http2FrameHeader& header, uint32_t window_size_increment) override { - HTTP2_VLOG(1) << "OnWindowUpdate: " << header - << "; window_size_increment=" << window_size_increment; + QUICHE_VLOG(1) << "OnWindowUpdate: " << header + << "; window_size_increment=" << window_size_increment; EXPECT_EQ(Http2FrameType::WINDOW_UPDATE, header.type); StartAndEndFrame(header)->OnWindowUpdate(header, window_size_increment); } void OnFrameSizeError(const Http2FrameHeader& header) override { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); } }; @@ -57,7 +57,7 @@ Http2WindowUpdateFields RandWindowUpdateFields() { Http2WindowUpdateFields fields; test::Randomize(&fields, RandomPtr()); - HTTP2_VLOG(3) << "RandWindowUpdateFields: " << fields; + QUICHE_VLOG(3) << "RandWindowUpdateFields: " << fields; return fields; } };
diff --git a/quiche/http2/hpack/decoder/hpack_block_collector.cc b/quiche/http2/hpack/decoder/hpack_block_collector.cc index e302338..08e46ff 100644 --- a/quiche/http2/hpack/decoder/hpack_block_collector.cc +++ b/quiche/http2/hpack/decoder/hpack_block_collector.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <memory> -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult; @@ -53,7 +53,7 @@ void HpackBlockCollector::PushPendingEntry() { EXPECT_TRUE(pending_entry_.IsComplete()); - HTTP2_DVLOG(2) << "PushPendingEntry: " << pending_entry_; + QUICHE_DVLOG(2) << "PushPendingEntry: " << pending_entry_; entries_.push_back(pending_entry_); EXPECT_TRUE(entries_.back().IsComplete()); pending_entry_.Clear();
diff --git a/quiche/http2/hpack/decoder/hpack_block_decoder.cc b/quiche/http2/hpack/decoder/hpack_block_decoder.cc index 8c8d4c0..5396142 100644 --- a/quiche/http2/hpack/decoder/hpack_block_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_block_decoder.cc
@@ -9,14 +9,14 @@ #include "absl/strings/str_cat.h" #include "quiche/http2/platform/api/http2_flag_utils.h" #include "quiche/http2/platform/api/http2_flags.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { DecodeStatus HpackBlockDecoder::Decode(DecodeBuffer* db) { if (!before_entry_) { - HTTP2_DVLOG(2) << "HpackBlockDecoder::Decode resume entry, db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(2) << "HpackBlockDecoder::Decode resume entry, db->Remaining=" + << db->Remaining(); DecodeStatus status = entry_decoder_.Resume(db, listener_); switch (status) { case DecodeStatus::kDecodeDone: @@ -32,8 +32,8 @@ } QUICHE_DCHECK(before_entry_); while (db->HasData()) { - HTTP2_DVLOG(2) << "HpackBlockDecoder::Decode start entry, db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(2) << "HpackBlockDecoder::Decode start entry, db->Remaining=" + << db->Remaining(); DecodeStatus status = entry_decoder_.Start(db, listener_); switch (status) { case DecodeStatus::kDecodeDone:
diff --git a/quiche/http2/hpack/decoder/hpack_block_decoder.h b/quiche/http2/hpack/decoder/hpack_block_decoder.h index 85ee8ff..0706067 100644 --- a/quiche/http2/hpack/decoder/hpack_block_decoder.h +++ b/quiche/http2/hpack/decoder/hpack_block_decoder.h
@@ -17,8 +17,8 @@ #include "quiche/http2/hpack/decoder/hpack_decoding_error.h" #include "quiche/http2/hpack/decoder/hpack_entry_decoder.h" #include "quiche/http2/hpack/decoder/hpack_entry_decoder_listener.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -37,7 +37,7 @@ // to be called from an implementation of Http2FrameDecoderListener's // OnHeadersStart or OnPushPromiseStart methods. void Reset() { - HTTP2_DVLOG(2) << "HpackBlockDecoder::Reset"; + QUICHE_DVLOG(2) << "HpackBlockDecoder::Reset"; before_entry_ = true; }
diff --git a/quiche/http2/hpack/decoder/hpack_decoder.cc b/quiche/http2/hpack/decoder/hpack_decoder.cc index 77ad8bd..04b321a 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder.cc
@@ -7,7 +7,7 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/platform/api/http2_flag_utils.h" #include "quiche/http2/platform/api/http2_flags.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -29,8 +29,8 @@ } bool HpackDecoder::StartDecodingBlock() { - HTTP2_DVLOG(3) << "HpackDecoder::StartDecodingBlock, error_detected=" - << (DetectError() ? "true" : "false"); + QUICHE_DVLOG(3) << "HpackDecoder::StartDecodingBlock, error_detected=" + << (DetectError() ? "true" : "false"); if (DetectError()) { return false; } @@ -43,9 +43,9 @@ } bool HpackDecoder::DecodeFragment(DecodeBuffer* db) { - HTTP2_DVLOG(3) << "HpackDecoder::DecodeFragment, error_detected=" - << (DetectError() ? "true" : "false") - << ", size=" << db->Remaining(); + QUICHE_DVLOG(3) << "HpackDecoder::DecodeFragment, error_detected=" + << (DetectError() ? "true" : "false") + << ", size=" << db->Remaining(); if (DetectError()) { HTTP2_CODE_COUNT_N(decompress_failure_3, 3, 23); return false; @@ -73,8 +73,8 @@ } bool HpackDecoder::EndDecodingBlock() { - HTTP2_DVLOG(3) << "HpackDecoder::EndDecodingBlock, error_detected=" - << (DetectError() ? "true" : "false"); + QUICHE_DVLOG(3) << "HpackDecoder::EndDecodingBlock, error_detected=" + << (DetectError() ? "true" : "false"); if (DetectError()) { HTTP2_CODE_COUNT_N(decompress_failure_3, 6, 23); return false; @@ -100,7 +100,7 @@ } if (decoder_state_.error() != HpackDecodingError::kOk) { - HTTP2_DVLOG(2) << "Error detected in decoder_state_"; + QUICHE_DVLOG(2) << "Error detected in decoder_state_"; HTTP2_CODE_COUNT_N(decompress_failure_3, 10, 23); error_ = decoder_state_.error(); detailed_error_ = decoder_state_.detailed_error(); @@ -111,9 +111,9 @@ void HpackDecoder::ReportError(HpackDecodingError error, std::string detailed_error) { - HTTP2_DVLOG(3) << "HpackDecoder::ReportError is new=" - << (error_ == HpackDecodingError::kOk ? "true" : "false") - << ", error: " << HpackDecodingErrorToString(error); + QUICHE_DVLOG(3) << "HpackDecoder::ReportError is new=" + << (error_ == HpackDecodingError::kOk ? "true" : "false") + << ", error: " << HpackDecodingErrorToString(error); if (error_ == HpackDecodingError::kOk) { error_ = error; detailed_error_ = detailed_error;
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_state.cc b/quiche/http2/hpack/decoder/hpack_decoder_state.cc index 074212e..e34be72 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_state.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_state.cc
@@ -7,7 +7,6 @@ #include <utility> #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -40,21 +39,21 @@ void HpackDecoderState::ApplyHeaderTableSizeSetting( uint32_t header_table_size) { - HTTP2_DVLOG(2) << "HpackDecoderState::ApplyHeaderTableSizeSetting(" - << header_table_size << ")"; + QUICHE_DVLOG(2) << "HpackDecoderState::ApplyHeaderTableSizeSetting(" + << header_table_size << ")"; QUICHE_DCHECK_LE(lowest_header_table_size_, final_header_table_size_); if (header_table_size < lowest_header_table_size_) { lowest_header_table_size_ = header_table_size; } final_header_table_size_ = header_table_size; - HTTP2_DVLOG(2) << "low water mark: " << lowest_header_table_size_; - HTTP2_DVLOG(2) << "final limit: " << final_header_table_size_; + QUICHE_DVLOG(2) << "low water mark: " << lowest_header_table_size_; + QUICHE_DVLOG(2) << "final limit: " << final_header_table_size_; } // Called to notify this object that we're starting to decode an HPACK block // (e.g. a HEADERS or PUSH_PROMISE frame's header has been decoded). void HpackDecoderState::OnHeaderBlockStart() { - HTTP2_DVLOG(2) << "HpackDecoderState::OnHeaderBlockStart"; + QUICHE_DVLOG(2) << "HpackDecoderState::OnHeaderBlockStart"; // This instance can't be reused after an error has been detected, as we must // assume that the encoder and decoder compression states are no longer // synchronized. @@ -72,14 +71,14 @@ (lowest_header_table_size_ < decoder_tables_.current_header_table_size() || final_header_table_size_ < decoder_tables_.header_table_size_limit()); - HTTP2_DVLOG(2) << "HpackDecoderState::OnHeaderListStart " - << "require_dynamic_table_size_update_=" - << require_dynamic_table_size_update_; + QUICHE_DVLOG(2) << "HpackDecoderState::OnHeaderListStart " + << "require_dynamic_table_size_update_=" + << require_dynamic_table_size_update_; listener_->OnHeaderListStart(); } void HpackDecoderState::OnIndexedHeader(size_t index) { - HTTP2_DVLOG(2) << "HpackDecoderState::OnIndexedHeader: " << index; + QUICHE_DVLOG(2) << "HpackDecoderState::OnIndexedHeader: " << index; if (error_ != HpackDecodingError::kOk) { return; } @@ -99,9 +98,9 @@ void HpackDecoderState::OnNameIndexAndLiteralValue( HpackEntryType entry_type, size_t name_index, HpackDecoderStringBuffer* value_buffer) { - HTTP2_DVLOG(2) << "HpackDecoderState::OnNameIndexAndLiteralValue " - << entry_type << ", " << name_index << ", " - << value_buffer->str(); + QUICHE_DVLOG(2) << "HpackDecoderState::OnNameIndexAndLiteralValue " + << entry_type << ", " << name_index << ", " + << value_buffer->str(); if (error_ != HpackDecodingError::kOk) { return; } @@ -125,8 +124,8 @@ void HpackDecoderState::OnLiteralNameAndValue( HpackEntryType entry_type, HpackDecoderStringBuffer* name_buffer, HpackDecoderStringBuffer* value_buffer) { - HTTP2_DVLOG(2) << "HpackDecoderState::OnLiteralNameAndValue " << entry_type - << ", " << name_buffer->str() << ", " << value_buffer->str(); + QUICHE_DVLOG(2) << "HpackDecoderState::OnLiteralNameAndValue " << entry_type + << ", " << name_buffer->str() << ", " << value_buffer->str(); if (error_ != HpackDecodingError::kOk) { return; } @@ -144,11 +143,11 @@ } void HpackDecoderState::OnDynamicTableSizeUpdate(size_t size_limit) { - HTTP2_DVLOG(2) << "HpackDecoderState::OnDynamicTableSizeUpdate " << size_limit - << ", required=" - << (require_dynamic_table_size_update_ ? "true" : "false") - << ", allowed=" - << (allow_dynamic_table_size_update_ ? "true" : "false"); + QUICHE_DVLOG(2) << "HpackDecoderState::OnDynamicTableSizeUpdate " + << size_limit << ", required=" + << (require_dynamic_table_size_update_ ? "true" : "false") + << ", allowed=" + << (allow_dynamic_table_size_update_ ? "true" : "false"); if (error_ != HpackDecodingError::kOk) { return; } @@ -188,15 +187,15 @@ void HpackDecoderState::OnHpackDecodeError(HpackDecodingError error, std::string detailed_error) { - HTTP2_DVLOG(2) << "HpackDecoderState::OnHpackDecodeError " - << HpackDecodingErrorToString(error); + QUICHE_DVLOG(2) << "HpackDecoderState::OnHpackDecodeError " + << HpackDecodingErrorToString(error); if (error_ == HpackDecodingError::kOk) { ReportError(error, detailed_error); } } void HpackDecoderState::OnHeaderBlockEnd() { - HTTP2_DVLOG(2) << "HpackDecoderState::OnHeaderBlockEnd"; + QUICHE_DVLOG(2) << "HpackDecoderState::OnHeaderBlockEnd"; if (error_ != HpackDecodingError::kOk) { return; } @@ -211,9 +210,9 @@ void HpackDecoderState::ReportError(HpackDecodingError error, std::string detailed_error) { - HTTP2_DVLOG(2) << "HpackDecoderState::ReportError is new=" - << (error_ == HpackDecodingError::kOk ? "true" : "false") - << ", error: " << HpackDecodingErrorToString(error); + QUICHE_DVLOG(2) << "HpackDecoderState::ReportError is new=" + << (error_ == HpackDecodingError::kOk ? "true" : "false") + << ", error: " << HpackDecodingErrorToString(error); if (error_ == HpackDecodingError::kOk) { listener_->OnHeaderErrorDetected(HpackDecodingErrorToString(error)); error_ = error;
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc index 3b3acdc..80814b9 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc
@@ -12,7 +12,7 @@ #include "absl/strings/string_view.h" #include "quiche/http2/hpack/http2_hpack_constants.h" #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_string_buffer.cc b/quiche/http2/hpack/decoder/hpack_decoder_string_buffer.cc index f1b5045..c57da8e 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_string_buffer.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_string_buffer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -57,12 +57,12 @@ HpackDecoderStringBuffer::~HpackDecoderStringBuffer() = default; void HpackDecoderStringBuffer::Reset() { - HTTP2_DVLOG(3) << "HpackDecoderStringBuffer::Reset"; + QUICHE_DVLOG(3) << "HpackDecoderStringBuffer::Reset"; state_ = State::RESET; } void HpackDecoderStringBuffer::Set(absl::string_view value, bool is_static) { - HTTP2_DVLOG(2) << "HpackDecoderStringBuffer::Set"; + QUICHE_DVLOG(2) << "HpackDecoderStringBuffer::Set"; QUICHE_DCHECK_EQ(state_, State::RESET); value_ = value; state_ = State::COMPLETE; @@ -73,7 +73,7 @@ } void HpackDecoderStringBuffer::OnStart(bool huffman_encoded, size_t len) { - HTTP2_DVLOG(2) << "HpackDecoderStringBuffer::OnStart"; + QUICHE_DVLOG(2) << "HpackDecoderStringBuffer::OnStart"; QUICHE_DCHECK_EQ(state_, State::RESET); remaining_len_ = len; @@ -106,8 +106,8 @@ } bool HpackDecoderStringBuffer::OnData(const char* data, size_t len) { - HTTP2_DVLOG(2) << "HpackDecoderStringBuffer::OnData state=" << state_ - << ", backing=" << backing_; + QUICHE_DVLOG(2) << "HpackDecoderStringBuffer::OnData state=" << state_ + << ", backing=" << backing_; QUICHE_DCHECK_EQ(state_, State::COLLECTING); QUICHE_DCHECK_LE(len, remaining_len_); remaining_len_ -= len; @@ -145,7 +145,7 @@ } bool HpackDecoderStringBuffer::OnEnd() { - HTTP2_DVLOG(2) << "HpackDecoderStringBuffer::OnEnd"; + QUICHE_DVLOG(2) << "HpackDecoderStringBuffer::OnEnd"; QUICHE_DCHECK_EQ(state_, State::COLLECTING); QUICHE_DCHECK_EQ(0u, remaining_len_); @@ -164,10 +164,10 @@ } void HpackDecoderStringBuffer::BufferStringIfUnbuffered() { - HTTP2_DVLOG(3) << "HpackDecoderStringBuffer::BufferStringIfUnbuffered state=" - << state_ << ", backing=" << backing_; + QUICHE_DVLOG(3) << "HpackDecoderStringBuffer::BufferStringIfUnbuffered state=" + << state_ << ", backing=" << backing_; if (state_ != State::RESET && backing_ == Backing::UNBUFFERED) { - HTTP2_DVLOG(2) + QUICHE_DVLOG(2) << "HpackDecoderStringBuffer buffering std::string of length " << value_.size(); buffer_.assign(value_.data(), value_.size()); @@ -179,17 +179,17 @@ } bool HpackDecoderStringBuffer::IsBuffered() const { - HTTP2_DVLOG(3) << "HpackDecoderStringBuffer::IsBuffered"; + QUICHE_DVLOG(3) << "HpackDecoderStringBuffer::IsBuffered"; return state_ != State::RESET && backing_ == Backing::BUFFERED; } size_t HpackDecoderStringBuffer::BufferedLength() const { - HTTP2_DVLOG(3) << "HpackDecoderStringBuffer::BufferedLength"; + QUICHE_DVLOG(3) << "HpackDecoderStringBuffer::BufferedLength"; return IsBuffered() ? buffer_.size() : 0; } absl::string_view HpackDecoderStringBuffer::str() const { - HTTP2_DVLOG(3) << "HpackDecoderStringBuffer::str"; + QUICHE_DVLOG(3) << "HpackDecoderStringBuffer::str"; QUICHE_DCHECK_EQ(state_, State::COMPLETE); return value_; } @@ -202,7 +202,7 @@ } std::string HpackDecoderStringBuffer::ReleaseString() { - HTTP2_DVLOG(3) << "HpackDecoderStringBuffer::ReleaseString"; + QUICHE_DVLOG(3) << "HpackDecoderStringBuffer::ReleaseString"; QUICHE_DCHECK_EQ(state_, State::COMPLETE); QUICHE_DCHECK_EQ(backing_, Backing::BUFFERED); if (state_ == State::COMPLETE) {
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc index 6378538..c932464 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc
@@ -9,7 +9,7 @@ #include <initializer_list> #include "absl/strings/escaping.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h" @@ -29,10 +29,10 @@ State state() const { return buf_.state_for_testing(); } Backing backing() const { return buf_.backing_for_testing(); } - // We want to know that HTTP2_LOG(x) << buf_ will work in production should + // We want to know that QUICHE_LOG(x) << buf_ will work in production should // that be needed, so we test that it outputs the expected values. AssertionResult VerifyLogHasSubstrs(std::initializer_list<std::string> strs) { - HTTP2_VLOG(1) << buf_; + QUICHE_VLOG(1) << buf_; std::ostringstream ss; buf_.OutputDebugStringTo(ss); std::string dbg_str(ss.str()); @@ -52,7 +52,7 @@ EXPECT_TRUE(VerifyLogHasSubstrs({"state=RESET"})); buf_.Set(data, /*is_static*/ true); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_EQ(state(), State::COMPLETE); EXPECT_EQ(backing(), Backing::STATIC); EXPECT_EQ(data, buf_.str()); @@ -73,13 +73,13 @@ TEST_F(HpackDecoderStringBufferTest, PlainWhole) { absl::string_view data("some text."); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_EQ(state(), State::RESET); buf_.OnStart(/*huffman_encoded*/ false, data.size()); EXPECT_EQ(state(), State::COLLECTING); EXPECT_EQ(backing(), Backing::RESET); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_TRUE(buf_.OnData(data.data(), data.size())); EXPECT_EQ(state(), State::COLLECTING); @@ -99,7 +99,7 @@ // Now force it to buffer the string, after which it will still have the same // string value, but the backing store will be different. buf_.BufferStringIfUnbuffered(); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_EQ(buf_.BufferedLength(), data.size()); EXPECT_EQ(data, buf_.str()); @@ -124,7 +124,7 @@ EXPECT_EQ(state(), State::COLLECTING); EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_EQ(buf_.BufferedLength(), part1.size()); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_TRUE(buf_.OnData(part2.data(), part2.size())); EXPECT_EQ(state(), State::COLLECTING); @@ -135,7 +135,7 @@ EXPECT_EQ(state(), State::COMPLETE); EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_EQ(buf_.BufferedLength(), data.size()); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; absl::string_view buffered = buf_.str(); EXPECT_EQ(data, buffered); @@ -186,31 +186,31 @@ EXPECT_EQ(state(), State::COLLECTING); EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_EQ(0u, buf_.BufferedLength()); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_TRUE(buf_.OnData(part1.data(), part1.size())); EXPECT_EQ(state(), State::COLLECTING); EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_GT(buf_.BufferedLength(), 0u); EXPECT_LT(buf_.BufferedLength(), decoded.size()); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_TRUE(buf_.OnData(part2.data(), part2.size())); EXPECT_EQ(state(), State::COLLECTING); EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_EQ(buf_.BufferedLength(), decoded.size()); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; EXPECT_TRUE(buf_.OnEnd()); EXPECT_EQ(state(), State::COMPLETE); EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_EQ(buf_.BufferedLength(), decoded.size()); EXPECT_EQ(decoded, buf_.str()); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; buf_.Reset(); EXPECT_EQ(state(), State::RESET); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; } TEST_F(HpackDecoderStringBufferTest, InvalidHuffmanOnData) { @@ -224,7 +224,7 @@ EXPECT_EQ(state(), State::COLLECTING); EXPECT_EQ(backing(), Backing::BUFFERED); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; } TEST_F(HpackDecoderStringBufferTest, InvalidHuffmanOnEnd) { @@ -239,7 +239,7 @@ EXPECT_EQ(backing(), Backing::BUFFERED); EXPECT_FALSE(buf_.OnEnd()); - HTTP2_LOG(INFO) << buf_; + QUICHE_LOG(INFO) << buf_; } // TODO(jamessynge): Add tests for ReleaseString().
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_tables.cc b/quiche/http2/hpack/decoder/hpack_decoder_tables.cc index 233e4b6..41cffa7 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_tables.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_tables.cc
@@ -6,7 +6,7 @@ #include "absl/strings/str_cat.h" #include "quiche/http2/hpack/http2_hpack_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace { @@ -37,11 +37,11 @@ HpackStringPair::HpackStringPair(std::string name, std::string value) : name(std::move(name)), value(std::move(value)) { - HTTP2_DVLOG(3) << DebugString() << " ctor"; + QUICHE_DVLOG(3) << DebugString() << " ctor"; } HpackStringPair::~HpackStringPair() { - HTTP2_DVLOG(3) << DebugString() << " dtor"; + QUICHE_DVLOG(3) << DebugString() << " dtor"; } std::string HpackStringPair::DebugString() const { @@ -71,8 +71,8 @@ HpackDecoderDynamicTable::~HpackDecoderDynamicTable() = default; void HpackDecoderDynamicTable::DynamicTableSizeUpdate(size_t size_limit) { - HTTP2_DVLOG(3) << "HpackDecoderDynamicTable::DynamicTableSizeUpdate " - << size_limit; + QUICHE_DVLOG(3) << "HpackDecoderDynamicTable::DynamicTableSizeUpdate " + << size_limit; EnsureSizeNoMoreThan(size_limit); QUICHE_DCHECK_LE(current_size_, size_limit); size_limit_ = size_limit; @@ -83,13 +83,13 @@ void HpackDecoderDynamicTable::Insert(std::string name, std::string value) { HpackStringPair entry(std::move(name), std::move(value)); size_t entry_size = entry.size(); - HTTP2_DVLOG(2) << "InsertEntry of size=" << entry_size - << "\n name: " << entry.name - << "\n value: " << entry.value; + QUICHE_DVLOG(2) << "InsertEntry of size=" << entry_size + << "\n name: " << entry.name + << "\n value: " << entry.value; if (entry_size > size_limit_) { - HTTP2_DVLOG(2) << "InsertEntry: entry larger than table, removing " - << table_.size() << " entries, of total size " - << current_size_ << " bytes."; + QUICHE_DVLOG(2) << "InsertEntry: entry larger than table, removing " + << table_.size() << " entries, of total size " + << current_size_ << " bytes."; table_.clear(); current_size_ = 0; return; @@ -99,7 +99,7 @@ EnsureSizeNoMoreThan(insert_limit); table_.push_front(entry); current_size_ += entry_size; - HTTP2_DVLOG(2) << "InsertEntry: current_size_=" << current_size_; + QUICHE_DVLOG(2) << "InsertEntry: current_size_=" << current_size_; QUICHE_DCHECK_GE(current_size_, entry_size); QUICHE_DCHECK_LE(current_size_, size_limit_); } @@ -112,8 +112,8 @@ } void HpackDecoderDynamicTable::EnsureSizeNoMoreThan(size_t limit) { - HTTP2_DVLOG(2) << "EnsureSizeNoMoreThan limit=" << limit - << ", current_size_=" << current_size_; + QUICHE_DVLOG(2) << "EnsureSizeNoMoreThan limit=" << limit + << ", current_size_=" << current_size_; // Not the most efficient choice, but any easy way to start. while (current_size_ > limit) { RemoveLastEntry(); @@ -124,8 +124,8 @@ void HpackDecoderDynamicTable::RemoveLastEntry() { QUICHE_DCHECK(!table_.empty()); if (!table_.empty()) { - HTTP2_DVLOG(2) << "RemoveLastEntry current_size_=" << current_size_ - << ", last entry size=" << table_.back().size(); + QUICHE_DVLOG(2) << "RemoveLastEntry current_size_=" << current_size_ + << ", last entry size=" << table_.back().size(); QUICHE_DCHECK_GE(current_size_, table_.back().size()); current_size_ -= table_.back().size(); table_.pop_back();
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc index 2336dd1..42ca482 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc
@@ -10,9 +10,9 @@ #include <vector> #include "quiche/http2/hpack/http2_hpack_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_util.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_test.cc index ab2c52d..398e1ec 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_test.cc
@@ -19,9 +19,9 @@ #include "quiche/http2/hpack/tools/hpack_block_builder.h" #include "quiche/http2/hpack/tools/hpack_example.h" #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_util.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h" @@ -122,7 +122,7 @@ } AssertionResult DecodeBlock(absl::string_view block) { - HTTP2_VLOG(1) << "HpackDecoderTest::DecodeBlock"; + QUICHE_VLOG(1) << "HpackDecoderTest::DecodeBlock"; VERIFY_FALSE(decoder_.DetectError()); VERIFY_TRUE(error_messages_.empty());
diff --git a/quiche/http2/hpack/decoder/hpack_entry_collector.cc b/quiche/http2/hpack/decoder/hpack_entry_collector.cc index 8ef3749..d7f89e8 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_collector.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_collector.cc
@@ -7,7 +7,7 @@ #include "absl/strings/str_cat.h" #include "quiche/http2/hpack/decoder/hpack_string_collector.h" #include "quiche/http2/hpack/http2_hpack_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc b/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc index 2649c72..3fca697 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_collector_test.cc
@@ -6,7 +6,7 @@ // Tests of HpackEntryCollector. -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" using ::testing::HasSubstr; @@ -17,27 +17,27 @@ TEST(HpackEntryCollectorTest, Clear) { HpackEntryCollector collector; - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; EXPECT_THAT(collector.ToString(), HasSubstr("!started")); EXPECT_TRUE(collector.IsClear()); collector.set_header_type(HpackEntryType::kIndexedLiteralHeader); EXPECT_FALSE(collector.IsClear()); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; collector.Clear(); EXPECT_TRUE(collector.IsClear()); collector.set_index(123); EXPECT_FALSE(collector.IsClear()); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; collector.Clear(); EXPECT_TRUE(collector.IsClear()); collector.set_name(HpackStringCollector("name", true)); EXPECT_FALSE(collector.IsClear()); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; collector.Clear(); EXPECT_TRUE(collector.IsClear()); collector.set_value(HpackStringCollector("value", false)); EXPECT_FALSE(collector.IsClear()); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; } // EXPECT_FATAL_FAILURE can not access variables in the scope of a test body, @@ -54,7 +54,7 @@ TEST(HpackEntryCollectorTest, IndexedHeader) { HpackEntryCollector collector; collector.OnIndexedHeader(123); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; EXPECT_FALSE(collector.IsClear()); EXPECT_TRUE(collector.IsComplete()); EXPECT_TRUE(collector.ValidateIndexedHeader(123)); @@ -73,15 +73,15 @@ TEST(HpackEntryCollectorTest, LiteralValueHeader) { HpackEntryCollector collector; collector.OnStartLiteralHeader(HpackEntryType::kIndexedLiteralHeader, 4); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; EXPECT_FALSE(collector.IsClear()); EXPECT_FALSE(collector.IsComplete()); EXPECT_THAT(collector.ToString(), HasSubstr("!ended")); collector.OnValueStart(true, 5); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; collector.OnValueData("value", 5); collector.OnValueEnd(); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; EXPECT_FALSE(collector.IsClear()); EXPECT_TRUE(collector.IsComplete()); EXPECT_TRUE(collector.ValidateLiteralValueHeader( @@ -102,19 +102,19 @@ TEST(HpackEntryCollectorTest, LiteralNameValueHeader) { HpackEntryCollector collector; collector.OnStartLiteralHeader(HpackEntryType::kUnindexedLiteralHeader, 0); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; EXPECT_FALSE(collector.IsClear()); EXPECT_FALSE(collector.IsComplete()); collector.OnNameStart(false, 4); collector.OnNameData("na", 2); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; collector.OnNameData("me", 2); collector.OnNameEnd(); collector.OnValueStart(true, 5); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; collector.OnValueData("Value", 5); collector.OnValueEnd(); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; EXPECT_FALSE(collector.IsClear()); EXPECT_TRUE(collector.IsComplete()); EXPECT_TRUE(collector.ValidateLiteralNameValueHeader( @@ -137,7 +137,7 @@ TEST(HpackEntryCollectorTest, DynamicTableSizeUpdate) { HpackEntryCollector collector; collector.OnDynamicTableSizeUpdate(8192); - HTTP2_VLOG(1) << collector; + QUICHE_VLOG(1) << collector; EXPECT_FALSE(collector.IsClear()); EXPECT_TRUE(collector.IsComplete()); EXPECT_TRUE(collector.ValidateDynamicTableSizeUpdate(8192));
diff --git a/quiche/http2/hpack/decoder/hpack_entry_decoder.cc b/quiche/http2/hpack/decoder/hpack_entry_decoder.cc index 1cb49c8..21a3b12 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_decoder.cc
@@ -11,8 +11,8 @@ #include "absl/base/macros.h" #include "quiche/http2/platform/api/http2_flag_utils.h" #include "quiche/http2/platform/api/http2_flags.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace { @@ -101,8 +101,8 @@ switch (state_) { case EntryDecoderState::kResumeDecodingType: // entry_type_decoder_ returned kDecodeInProgress when last called. - HTTP2_DVLOG(1) << "kResumeDecodingType: db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(1) << "kResumeDecodingType: db->Remaining=" + << db->Remaining(); status = entry_type_decoder_.Resume(db); if (status == DecodeStatus::kDecodeError) { HTTP2_CODE_COUNT_N(decompress_failure_3, 12, 23); @@ -117,7 +117,7 @@ case EntryDecoderState::kDecodedType: // entry_type_decoder_ returned kDecodeDone, now need to decide how // to proceed. - HTTP2_DVLOG(1) << "kDecodedType: db->Remaining=" << db->Remaining(); + QUICHE_DVLOG(1) << "kDecodedType: db->Remaining=" << db->Remaining(); if (DispatchOnType(listener)) { // All done. return DecodeStatus::kDecodeDone; @@ -125,8 +125,8 @@ continue; case EntryDecoderState::kStartDecodingName: - HTTP2_DVLOG(1) << "kStartDecodingName: db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(1) << "kStartDecodingName: db->Remaining=" + << db->Remaining(); { NameDecoderListener ncb(listener); status = string_decoder_.Start(db, &ncb); @@ -147,8 +147,8 @@ ABSL_FALLTHROUGH_INTENDED; case EntryDecoderState::kStartDecodingValue: - HTTP2_DVLOG(1) << "kStartDecodingValue: db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(1) << "kStartDecodingValue: db->Remaining=" + << db->Remaining(); { ValueDecoderListener vcb(listener); status = string_decoder_.Start(db, &vcb); @@ -171,8 +171,8 @@ case EntryDecoderState::kResumeDecodingName: // The literal name was split across decode buffers. - HTTP2_DVLOG(1) << "kResumeDecodingName: db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(1) << "kResumeDecodingName: db->Remaining=" + << db->Remaining(); { NameDecoderListener ncb(listener); status = string_decoder_.Resume(db, &ncb); @@ -194,8 +194,8 @@ case EntryDecoderState::kResumeDecodingValue: // The literal value was split across decode buffers. - HTTP2_DVLOG(1) << "kResumeDecodingValue: db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(1) << "kResumeDecodingValue: db->Remaining=" + << db->Remaining(); { ValueDecoderListener vcb(listener); status = string_decoder_.Resume(db, &vcb);
diff --git a/quiche/http2/hpack/decoder/hpack_entry_decoder.h b/quiche/http2/hpack/decoder/hpack_entry_decoder.h index d45f154..75ffbac 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_decoder.h +++ b/quiche/http2/hpack/decoder/hpack_entry_decoder.h
@@ -19,8 +19,8 @@ #include "quiche/http2/hpack/decoder/hpack_entry_type_decoder.h" #include "quiche/http2/hpack/decoder/hpack_string_decoder.h" #include "quiche/http2/hpack/http2_hpack_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/hpack/decoder/hpack_entry_decoder_listener.cc b/quiche/http2/hpack/decoder/hpack_entry_decoder_listener.cc index bb55ec0..16b1420 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_decoder_listener.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_decoder_listener.cc
@@ -4,12 +4,12 @@ #include "quiche/http2/hpack/decoder/hpack_entry_decoder_listener.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { void HpackEntryDecoderVLoggingListener::OnIndexedHeader(size_t index) { - HTTP2_VLOG(1) << "OnIndexedHeader, index=" << index; + QUICHE_VLOG(1) << "OnIndexedHeader, index=" << index; if (wrapped_) { wrapped_->OnIndexedHeader(index); } @@ -17,8 +17,8 @@ void HpackEntryDecoderVLoggingListener::OnStartLiteralHeader( HpackEntryType entry_type, size_t maybe_name_index) { - HTTP2_VLOG(1) << "OnStartLiteralHeader: entry_type=" << entry_type - << ", maybe_name_index=" << maybe_name_index; + QUICHE_VLOG(1) << "OnStartLiteralHeader: entry_type=" << entry_type + << ", maybe_name_index=" << maybe_name_index; if (wrapped_) { wrapped_->OnStartLiteralHeader(entry_type, maybe_name_index); } @@ -26,7 +26,7 @@ void HpackEntryDecoderVLoggingListener::OnNameStart(bool huffman_encoded, size_t len) { - HTTP2_VLOG(1) << "OnNameStart: H=" << huffman_encoded << ", len=" << len; + QUICHE_VLOG(1) << "OnNameStart: H=" << huffman_encoded << ", len=" << len; if (wrapped_) { wrapped_->OnNameStart(huffman_encoded, len); } @@ -34,14 +34,14 @@ void HpackEntryDecoderVLoggingListener::OnNameData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnNameData: len=" << len; + QUICHE_VLOG(1) << "OnNameData: len=" << len; if (wrapped_) { wrapped_->OnNameData(data, len); } } void HpackEntryDecoderVLoggingListener::OnNameEnd() { - HTTP2_VLOG(1) << "OnNameEnd"; + QUICHE_VLOG(1) << "OnNameEnd"; if (wrapped_) { wrapped_->OnNameEnd(); } @@ -49,7 +49,7 @@ void HpackEntryDecoderVLoggingListener::OnValueStart(bool huffman_encoded, size_t len) { - HTTP2_VLOG(1) << "OnValueStart: H=" << huffman_encoded << ", len=" << len; + QUICHE_VLOG(1) << "OnValueStart: H=" << huffman_encoded << ", len=" << len; if (wrapped_) { wrapped_->OnValueStart(huffman_encoded, len); } @@ -57,21 +57,21 @@ void HpackEntryDecoderVLoggingListener::OnValueData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnValueData: len=" << len; + QUICHE_VLOG(1) << "OnValueData: len=" << len; if (wrapped_) { wrapped_->OnValueData(data, len); } } void HpackEntryDecoderVLoggingListener::OnValueEnd() { - HTTP2_VLOG(1) << "OnValueEnd"; + QUICHE_VLOG(1) << "OnValueEnd"; if (wrapped_) { wrapped_->OnValueEnd(); } } void HpackEntryDecoderVLoggingListener::OnDynamicTableSizeUpdate(size_t size) { - HTTP2_VLOG(1) << "OnDynamicTableSizeUpdate: size=" << size; + QUICHE_VLOG(1) << "OnDynamicTableSizeUpdate: size=" << size; if (wrapped_) { wrapped_->OnDynamicTableSizeUpdate(size); }
diff --git a/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc b/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc index c1ff3ee..f49b508 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_type_decoder.cc
@@ -7,8 +7,8 @@ #include "absl/strings/str_cat.h" #include "quiche/http2/platform/api/http2_flag_utils.h" #include "quiche/http2/platform/api/http2_flags.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/hpack/decoder/hpack_entry_type_decoder.h b/quiche/http2/hpack/decoder/hpack_entry_type_decoder.h index 94554d4..bf6a2c9 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_type_decoder.h +++ b/quiche/http2/hpack/decoder/hpack_entry_type_decoder.h
@@ -17,8 +17,8 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/hpack/http2_hpack_constants.h" #include "quiche/http2/hpack/varint/hpack_varint_decoder.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc index be0d5ac..fe1a710 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc
@@ -7,8 +7,8 @@ #include <vector> #include "quiche/http2/hpack/tools/hpack_block_builder.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/hpack/decoder/hpack_string_decoder.h b/quiche/http2/hpack/decoder/hpack_string_decoder.h index 471bbc7..c8b88f3 100644 --- a/quiche/http2/hpack/decoder/hpack_string_decoder.h +++ b/quiche/http2/hpack/decoder/hpack_string_decoder.h
@@ -19,8 +19,8 @@ #include "quiche/http2/decoder/decode_buffer.h" #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/hpack/varint/hpack_varint_decoder.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { @@ -81,8 +81,8 @@ while (true) { switch (state_) { case kStartDecodingLength: - HTTP2_DVLOG(2) << "kStartDecodingLength: db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(2) << "kStartDecodingLength: db->Remaining=" + << db->Remaining(); if (!StartDecodingLength(db, cb, &status)) { // The length is split across decode buffers. return status; @@ -99,13 +99,13 @@ ABSL_FALLTHROUGH_INTENDED; case kDecodingString: - HTTP2_DVLOG(2) << "kDecodingString: db->Remaining=" << db->Remaining() - << " remaining_=" << remaining_; + QUICHE_DVLOG(2) << "kDecodingString: db->Remaining=" + << db->Remaining() << " remaining_=" << remaining_; return DecodeString(db, cb); case kResumeDecodingLength: - HTTP2_DVLOG(2) << "kResumeDecodingLength: db->Remaining=" - << db->Remaining(); + QUICHE_DVLOG(2) << "kResumeDecodingLength: db->Remaining=" + << db->Remaining(); if (!ResumeDecodingLength(db, cb, &status)) { return status; }
diff --git a/quiche/http2/hpack/decoder/hpack_string_decoder_listener.cc b/quiche/http2/hpack/decoder/hpack_string_decoder_listener.cc index fef70c2..afc1721 100644 --- a/quiche/http2/hpack/decoder/hpack_string_decoder_listener.cc +++ b/quiche/http2/hpack/decoder/hpack_string_decoder_listener.cc
@@ -4,14 +4,14 @@ #include "quiche/http2/hpack/decoder/hpack_string_decoder_listener.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace test { void HpackStringDecoderVLoggingListener::OnStringStart(bool huffman_encoded, size_t len) { - HTTP2_VLOG(1) << "OnStringStart: H=" << huffman_encoded << ", len=" << len; + QUICHE_VLOG(1) << "OnStringStart: H=" << huffman_encoded << ", len=" << len; if (wrapped_) { wrapped_->OnStringStart(huffman_encoded, len); } @@ -19,14 +19,14 @@ void HpackStringDecoderVLoggingListener::OnStringData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnStringData: len=" << len; + QUICHE_VLOG(1) << "OnStringData: len=" << len; if (wrapped_) { return wrapped_->OnStringData(data, len); } } void HpackStringDecoderVLoggingListener::OnStringEnd() { - HTTP2_VLOG(1) << "OnStringEnd"; + QUICHE_VLOG(1) << "OnStringEnd"; if (wrapped_) { return wrapped_->OnStringEnd(); }
diff --git a/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc index e10c7b1..eb034af 100644 --- a/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc
@@ -36,13 +36,13 @@ DecodeStatus ResumeDecoding(DecodeBuffer* b) override { // Provides coverage of DebugString and StateToString. // Not validating output. - HTTP2_VLOG(1) << decoder_.DebugString(); - HTTP2_VLOG(2) << collector_; + QUICHE_VLOG(1) << decoder_.DebugString(); + QUICHE_VLOG(2) << collector_; return decoder_.Resume(b, &listener_); } AssertionResult Collected(absl::string_view s, bool huffman_encoded) { - HTTP2_VLOG(1) << collector_; + QUICHE_VLOG(1) << collector_; return collector_.Collected(s, huffman_encoded); } @@ -62,9 +62,9 @@ VERIFY_NE(collector_, HpackStringCollector(expected_str, expected_huffman)); } - HTTP2_VLOG(2) << collector_.ToString(); + QUICHE_VLOG(2) << collector_.ToString(); collector_.Clear(); - HTTP2_VLOG(2) << collector_; + QUICHE_VLOG(2) << collector_; return result; }; }
diff --git a/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc b/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc index 3bb9652..dbc0adb 100644 --- a/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc +++ b/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc
@@ -7,7 +7,6 @@ #include "absl/strings/str_cat.h" #include "quiche/http2/platform/api/http2_flag_utils.h" #include "quiche/http2/platform/api/http2_flags.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/quiche_text_utils.h" @@ -36,26 +35,27 @@ } void HpackWholeEntryBuffer::OnIndexedHeader(size_t index) { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnIndexedHeader: index=" << index; + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnIndexedHeader: index=" << index; listener_->OnIndexedHeader(index); } void HpackWholeEntryBuffer::OnStartLiteralHeader(HpackEntryType entry_type, size_t maybe_name_index) { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnStartLiteralHeader: entry_type=" - << entry_type << ", maybe_name_index=" << maybe_name_index; + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnStartLiteralHeader: entry_type=" + << entry_type << ", maybe_name_index=" << maybe_name_index; entry_type_ = entry_type; maybe_name_index_ = maybe_name_index; } void HpackWholeEntryBuffer::OnNameStart(bool huffman_encoded, size_t len) { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnNameStart: huffman_encoded=" - << (huffman_encoded ? "true" : "false") << ", len=" << len; + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnNameStart: huffman_encoded=" + << (huffman_encoded ? "true" : "false") << ", len=" << len; QUICHE_DCHECK_EQ(maybe_name_index_, 0u); if (!error_detected_) { if (len > max_string_size_bytes_) { - HTTP2_DVLOG(1) << "Name length (" << len << ") is longer than permitted (" - << max_string_size_bytes_ << ")"; + QUICHE_DVLOG(1) << "Name length (" << len + << ") is longer than permitted (" + << max_string_size_bytes_ << ")"; ReportError(HpackDecodingError::kNameTooLong, ""); HTTP2_CODE_COUNT_N(decompress_failure_3, 18, 23); return; @@ -65,10 +65,10 @@ } void HpackWholeEntryBuffer::OnNameData(const char* data, size_t len) { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnNameData: len=" << len - << " data:\n" - << quiche::QuicheTextUtils::HexDump( - absl::string_view(data, len)); + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnNameData: len=" << len + << " data:\n" + << quiche::QuicheTextUtils::HexDump( + absl::string_view(data, len)); QUICHE_DCHECK_EQ(maybe_name_index_, 0u); if (!error_detected_ && !name_.OnData(data, len)) { ReportError(HpackDecodingError::kNameHuffmanError, ""); @@ -77,7 +77,7 @@ } void HpackWholeEntryBuffer::OnNameEnd() { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnNameEnd"; + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnNameEnd"; QUICHE_DCHECK_EQ(maybe_name_index_, 0u); if (!error_detected_ && !name_.OnEnd()) { ReportError(HpackDecodingError::kNameHuffmanError, ""); @@ -86,14 +86,14 @@ } void HpackWholeEntryBuffer::OnValueStart(bool huffman_encoded, size_t len) { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnValueStart: huffman_encoded=" - << (huffman_encoded ? "true" : "false") << ", len=" << len; + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnValueStart: huffman_encoded=" + << (huffman_encoded ? "true" : "false") << ", len=" << len; if (!error_detected_) { if (len > max_string_size_bytes_) { std::string detailed_error = absl::StrCat( "Value length (", len, ") of [", name_.GetStringIfComplete(), "] is longer than permitted (", max_string_size_bytes_, ")"); - HTTP2_DVLOG(1) << detailed_error; + QUICHE_DVLOG(1) << detailed_error; ReportError(HpackDecodingError::kValueTooLong, detailed_error); HTTP2_CODE_COUNT_N(decompress_failure_3, 21, 23); return; @@ -103,10 +103,10 @@ } void HpackWholeEntryBuffer::OnValueData(const char* data, size_t len) { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnValueData: len=" << len - << " data:\n" - << quiche::QuicheTextUtils::HexDump( - absl::string_view(data, len)); + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnValueData: len=" << len + << " data:\n" + << quiche::QuicheTextUtils::HexDump( + absl::string_view(data, len)); if (!error_detected_ && !value_.OnData(data, len)) { ReportError(HpackDecodingError::kValueHuffmanError, ""); HTTP2_CODE_COUNT_N(decompress_failure_3, 22, 23); @@ -114,7 +114,7 @@ } void HpackWholeEntryBuffer::OnValueEnd() { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnValueEnd"; + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnValueEnd"; if (error_detected_) { return; } @@ -134,16 +134,16 @@ } void HpackWholeEntryBuffer::OnDynamicTableSizeUpdate(size_t size) { - HTTP2_DVLOG(2) << "HpackWholeEntryBuffer::OnDynamicTableSizeUpdate: size=" - << size; + QUICHE_DVLOG(2) << "HpackWholeEntryBuffer::OnDynamicTableSizeUpdate: size=" + << size; listener_->OnDynamicTableSizeUpdate(size); } void HpackWholeEntryBuffer::ReportError(HpackDecodingError error, std::string detailed_error) { if (!error_detected_) { - HTTP2_DVLOG(1) << "HpackWholeEntryBuffer::ReportError: " - << HpackDecodingErrorToString(error); + QUICHE_DVLOG(1) << "HpackWholeEntryBuffer::ReportError: " + << HpackDecodingErrorToString(error); error_detected_ = true; listener_->OnHpackDecodeError(error, detailed_error); listener_ = HpackWholeEntryNoOpListener::NoOpListener();
diff --git a/quiche/http2/hpack/http2_hpack_constants_test.cc b/quiche/http2/hpack/http2_hpack_constants_test.cc index 61b465f..39bacd4 100644 --- a/quiche/http2/hpack/http2_hpack_constants_test.cc +++ b/quiche/http2/hpack/http2_hpack_constants_test.cc
@@ -6,7 +6,7 @@ #include <sstream> -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 {
diff --git a/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc b/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc index 92afdc2..3727557 100644 --- a/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc +++ b/quiche/http2/hpack/huffman/hpack_huffman_decoder.cc
@@ -7,7 +7,7 @@ #include <bitset> #include <limits> -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" // Terminology: // @@ -411,13 +411,13 @@ HpackHuffmanDecoder::~HpackHuffmanDecoder() = default; bool HpackHuffmanDecoder::Decode(absl::string_view input, std::string* output) { - HTTP2_DVLOG(1) << "HpackHuffmanDecoder::Decode"; + QUICHE_DVLOG(1) << "HpackHuffmanDecoder::Decode"; // Fill bit_buffer_ from input. input.remove_prefix(bit_buffer_.AppendBytes(input)); while (true) { - HTTP2_DVLOG(3) << "Enter Decode Loop, bit_buffer_: " << bit_buffer_; + QUICHE_DVLOG(3) << "Enter Decode Loop, bit_buffer_: " << bit_buffer_; if (bit_buffer_.count() >= 7) { // Get high 7 bits of the bit buffer, see if that contains a complete // code of 5, 6 or 7 bits. @@ -443,10 +443,10 @@ } HuffmanCode code_prefix = bit_buffer_.value() >> kExtraAccumulatorBitCount; - HTTP2_DVLOG(3) << "code_prefix: " << HuffmanCodeBitSet(code_prefix); + QUICHE_DVLOG(3) << "code_prefix: " << HuffmanCodeBitSet(code_prefix); PrefixInfo prefix_info = PrefixToInfo(code_prefix); - HTTP2_DVLOG(3) << "prefix_info: " << prefix_info; + QUICHE_DVLOG(3) << "prefix_info: " << prefix_info; QUICHE_DCHECK_LE(kMinCodeBitCount, prefix_info.code_length); QUICHE_DCHECK_LE(prefix_info.code_length, kMaxCodeBitCount); @@ -461,8 +461,8 @@ continue; } // Encoder is not supposed to explicity encode the EOS symbol. - HTTP2_DLOG(ERROR) << "EOS explicitly encoded!\n " << bit_buffer_ << "\n " - << prefix_info; + QUICHE_DLOG(ERROR) << "EOS explicitly encoded!\n " << bit_buffer_ << "\n " + << prefix_info; return false; } // bit_buffer_ doesn't have enough bits in it to decode the next symbol.
diff --git a/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc b/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc index 15b94a7..aa16ea3 100644 --- a/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc +++ b/quiche/http2/hpack/huffman/hpack_huffman_encoder.cc
@@ -5,7 +5,7 @@ #include "quiche/http2/hpack/huffman/hpack_huffman_encoder.h" #include "quiche/http2/hpack/huffman/huffman_spec_tables.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/hpack/tools/hpack_example.cc b/quiche/http2/hpack/tools/hpack_example.cc index b44bddd..15ac3b3 100644 --- a/quiche/http2/hpack/tools/hpack_example.cc +++ b/quiche/http2/hpack/tools/hpack_example.cc
@@ -8,8 +8,8 @@ #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_bug_tracker.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 { namespace test {
diff --git a/quiche/http2/hpack/varint/hpack_varint_decoder.cc b/quiche/http2/hpack/varint/hpack_varint_decoder.cc index 3334807..48f5aa37 100644 --- a/quiche/http2/hpack/varint/hpack_varint_decoder.cc +++ b/quiche/http2/hpack/varint/hpack_varint_decoder.cc
@@ -103,7 +103,7 @@ } // Signal error if value is too large or there are too many extension bytes. - HTTP2_DLOG(WARNING) + QUICHE_DLOG(WARNING) << "Variable length int encoding is too large or too long. " << DebugString(); MarkDone();
diff --git a/quiche/http2/hpack/varint/hpack_varint_decoder.h b/quiche/http2/hpack/varint/hpack_varint_decoder.h index d2c8feb..0036752 100644 --- a/quiche/http2/hpack/varint/hpack_varint_decoder.h +++ b/quiche/http2/hpack/varint/hpack_varint_decoder.h
@@ -33,8 +33,8 @@ #include "quiche/http2/decoder/decode_buffer.h" #include "quiche/http2/decoder/decode_status.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/hpack/varint/hpack_varint_decoder_test.cc b/quiche/http2/hpack/varint/hpack_varint_decoder_test.cc index 020ca0f..f4c6de5 100644 --- a/quiche/http2/hpack/varint/hpack_varint_decoder_test.cc +++ b/quiche/http2/hpack/varint/hpack_varint_decoder_test.cc
@@ -11,8 +11,8 @@ #include "absl/base/macros.h" #include "absl/strings/escaping.h" #include "absl/strings/string_view.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h"
diff --git a/quiche/http2/hpack/varint/hpack_varint_encoder.cc b/quiche/http2/hpack/varint/hpack_varint_encoder.cc index 89beb4a..07c5141 100644 --- a/quiche/http2/hpack/varint/hpack_varint_encoder.cc +++ b/quiche/http2/hpack/varint/hpack_varint_encoder.cc
@@ -6,7 +6,7 @@ #include <limits> -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc b/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc index ba51649..06cc88d 100644 --- a/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc +++ b/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc
@@ -17,8 +17,8 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "quiche/http2/hpack/tools/hpack_block_builder.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/quiche_text_utils.h" @@ -166,9 +166,9 @@ quiche::QuicheTextUtils::HexDump(buffer_)); if (value == minimum) { - HTTP2_LOG(INFO) << "Checking minimum; " << msg; + QUICHE_LOG(INFO) << "Checking minimum; " << msg; } else if (value == maximum) { - HTTP2_LOG(INFO) << "Checking maximum; " << msg; + QUICHE_LOG(INFO) << "Checking maximum; " << msg; } SCOPED_TRACE(msg); @@ -204,15 +204,16 @@ const uint8_t prefix_mask = (1 << prefix_length) - 1; const uint64_t beyond = start + range; - HTTP2_LOG(INFO) + QUICHE_LOG(INFO) << "############################################################"; - HTTP2_LOG(INFO) << "prefix_length=" << static_cast<int>(prefix_length); - HTTP2_LOG(INFO) << "prefix_mask=" << std::hex - << static_cast<int>(prefix_mask); - HTTP2_LOG(INFO) << "start=" << start << " (" << std::hex << start << ")"; - HTTP2_LOG(INFO) << "range=" << range << " (" << std::hex << range << ")"; - HTTP2_LOG(INFO) << "beyond=" << beyond << " (" << std::hex << beyond << ")"; - HTTP2_LOG(INFO) << "expected_bytes=" << expected_bytes; + QUICHE_LOG(INFO) << "prefix_length=" << static_cast<int>(prefix_length); + QUICHE_LOG(INFO) << "prefix_mask=" << std::hex + << static_cast<int>(prefix_mask); + QUICHE_LOG(INFO) << "start=" << start << " (" << std::hex << start << ")"; + QUICHE_LOG(INFO) << "range=" << range << " (" << std::hex << range << ")"; + QUICHE_LOG(INFO) << "beyond=" << beyond << " (" << std::hex << beyond + << ")"; + QUICHE_LOG(INFO) << "expected_bytes=" << expected_bytes; if (expected_bytes < 11) { // Confirm the claim that beyond requires more bytes. @@ -259,12 +260,12 @@ const uint64_t i = HiValueOfExtensionBytes(8, prefix_length); const uint64_t j = HiValueOfExtensionBytes(9, prefix_length); - HTTP2_LOG(INFO) + QUICHE_LOG(INFO) << "############################################################"; - HTTP2_LOG(INFO) << "prefix_length=" << prefix_length << " a=" << a - << " b=" << b << " c=" << c << " d=" << d - << " e=" << e << " f=" << f << " g=" << g - << " h=" << h << " i=" << i << " j=" << j; + QUICHE_LOG(INFO) << "prefix_length=" << prefix_length << " a=" << a + << " b=" << b << " c=" << c << " d=" << d + << " e=" << e << " f=" << f << " g=" << g + << " h=" << h << " i=" << i << " j=" << j; std::vector<uint64_t> values = { 0, 1, // Force line break. @@ -283,8 +284,8 @@ for (uint64_t value : values) { EncodeNoRandom(value, prefix_length); std::string dump = quiche::QuicheTextUtils::HexDump(buffer_); - HTTP2_LOG(INFO) << absl::StrFormat("%10llu %0#18x ", value, value) - << quiche::QuicheTextUtils::HexDump(buffer_).substr(7); + QUICHE_LOG(INFO) << absl::StrFormat("%10llu %0#18x ", value, value) + << quiche::QuicheTextUtils::HexDump(buffer_).substr(7); } } }
diff --git a/quiche/http2/http2_constants.cc b/quiche/http2/http2_constants.cc index 3b947b5..34fe2dd 100644 --- a/quiche/http2/http2_constants.cc +++ b/quiche/http2/http2_constants.cc
@@ -8,7 +8,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "quiche/http2/platform/api/http2_flag_utils.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/http2_structures.h b/quiche/http2/http2_structures.h index 49d55b5..496746b 100644 --- a/quiche/http2/http2_structures.h +++ b/quiche/http2/http2_structures.h
@@ -32,8 +32,8 @@ #include <string> #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" namespace http2 {
diff --git a/quiche/http2/http2_structures_test.cc b/quiche/http2/http2_structures_test.cc index 2483837..ab3dd99 100644 --- a/quiche/http2/http2_structures_test.cc +++ b/quiche/http2/http2_structures_test.cc
@@ -155,9 +155,9 @@ protected: Http2FrameHeaderTypeAndFlagTest() : type_(std::get<0>(GetParam())), flags_(std::get<1>(GetParam())) { - HTTP2_LOG(INFO) << "Frame type: " << type_; - HTTP2_LOG(INFO) << "Frame flags: " - << Http2FrameFlagsToString(type_, flags_); + QUICHE_LOG(INFO) << "Frame type: " << type_; + QUICHE_LOG(INFO) << "Frame flags: " + << Http2FrameFlagsToString(type_, flags_); } const Http2FrameType type_;
diff --git a/quiche/http2/platform/api/http2_logging.h b/quiche/http2/platform/api/http2_logging.h deleted file mode 100644 index aa39e25..0000000 --- a/quiche/http2/platform/api/http2_logging.h +++ /dev/null
@@ -1,21 +0,0 @@ -#ifndef QUICHE_HTTP2_PLATFORM_API_HTTP2_LOGGING_H_ -#define QUICHE_HTTP2_PLATFORM_API_HTTP2_LOGGING_H_ - -#include "quiche/common/platform/api/quiche_logging.h" - -#define HTTP2_LOG(severity) QUICHE_LOG(severity) - -#define HTTP2_VLOG(verbose_level) QUICHE_VLOG(verbose_level) - -#define HTTP2_DLOG(severity) QUICHE_DLOG(severity) - -#define HTTP2_DLOG_IF(severity, condition) QUICHE_DLOG_IF(severity, condition) - -#define HTTP2_DVLOG(verbose_level) QUICHE_DVLOG(verbose_level) - -#define HTTP2_DVLOG_IF(verbose_level, condition) \ - QUICHE_DVLOG_IF(verbose_level, condition) - -#define HTTP2_LOG_FIRST_N(severity, n) QUICHE_LOG_FIRST_N(severity, n) - -#endif // QUICHE_HTTP2_PLATFORM_API_HTTP2_LOGGING_H_
diff --git a/quiche/http2/test_tools/frame_parts.cc b/quiche/http2/test_tools/frame_parts.cc index 14302d9..ba0396a 100644 --- a/quiche/http2/test_tools/frame_parts.cc +++ b/quiche/http2/test_tools/frame_parts.cc
@@ -8,7 +8,7 @@ #include "absl/strings/escaping.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h" @@ -47,20 +47,20 @@ } // namespace FrameParts::FrameParts(const Http2FrameHeader& header) : frame_header_(header) { - HTTP2_VLOG(1) << "FrameParts, header: " << frame_header_; + QUICHE_VLOG(1) << "FrameParts, header: " << frame_header_; } FrameParts::FrameParts(const Http2FrameHeader& header, absl::string_view payload) : FrameParts(header) { - HTTP2_VLOG(1) << "FrameParts with payload.size() = " << payload.size(); + QUICHE_VLOG(1) << "FrameParts with payload.size() = " << payload.size(); this->payload_.append(payload.data(), payload.size()); opt_payload_length_ = payload.size(); } FrameParts::FrameParts(const Http2FrameHeader& header, absl::string_view payload, size_t total_pad_length) : FrameParts(header, payload) { - HTTP2_VLOG(1) << "FrameParts with total_pad_length=" << total_pad_length; + QUICHE_VLOG(1) << "FrameParts with total_pad_length=" << total_pad_length; SetTotalPadLength(total_pad_length); } @@ -110,10 +110,10 @@ } if (opt_pad_length_) { - HTTP2_VLOG(1) << "SetTotalPadLength: pad_length=" - << opt_pad_length_.value(); + QUICHE_VLOG(1) << "SetTotalPadLength: pad_length=" + << opt_pad_length_.value(); } else { - HTTP2_VLOG(1) << "SetTotalPadLength: has no pad length"; + QUICHE_VLOG(1) << "SetTotalPadLength: has no pad length"; } } @@ -131,33 +131,33 @@ } void FrameParts::OnDataStart(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnDataStart: " << header; + QUICHE_VLOG(1) << "OnDataStart: " << header; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::DATA)) << *this; opt_payload_length_ = header.payload_length; } void FrameParts::OnDataPayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnDataPayload: len=" << len - << "; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnDataPayload: len=" << len + << "; frame_header_: " << frame_header_; ASSERT_TRUE(InFrameOfType(Http2FrameType::DATA)) << *this; ASSERT_TRUE(AppendString(absl::string_view(data, len), &payload_, &opt_payload_length_)); } void FrameParts::OnDataEnd() { - HTTP2_VLOG(1) << "OnDataEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnDataEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::DATA)) << *this; } void FrameParts::OnHeadersStart(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnHeadersStart: " << header; + QUICHE_VLOG(1) << "OnHeadersStart: " << header; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::HEADERS)) << *this; opt_payload_length_ = header.payload_length; } void FrameParts::OnHeadersPriority(const Http2PriorityFields& priority) { - HTTP2_VLOG(1) << "OnHeadersPriority: priority: " << priority - << "; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnHeadersPriority: priority: " << priority + << "; frame_header_: " << frame_header_; ASSERT_TRUE(InFrameOfType(Http2FrameType::HEADERS)) << *this; ASSERT_FALSE(opt_priority_); opt_priority_ = priority; @@ -167,8 +167,8 @@ } void FrameParts::OnHpackFragment(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnHpackFragment: len=" << len - << "; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnHpackFragment: len=" << len + << "; frame_header_: " << frame_header_; ASSERT_TRUE(got_start_callback_); ASSERT_FALSE(got_end_callback_); ASSERT_TRUE(FrameCanHaveHpackPayload(frame_header_)) << *this; @@ -177,13 +177,13 @@ } void FrameParts::OnHeadersEnd() { - HTTP2_VLOG(1) << "OnHeadersEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnHeadersEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::HEADERS)) << *this; } void FrameParts::OnPriorityFrame(const Http2FrameHeader& header, const Http2PriorityFields& priority) { - HTTP2_VLOG(1) << "OnPriorityFrame: " << header << "; priority: " << priority; + QUICHE_VLOG(1) << "OnPriorityFrame: " << header << "; priority: " << priority; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PRIORITY)) << *this; ASSERT_FALSE(opt_priority_); opt_priority_ = priority; @@ -191,18 +191,18 @@ } void FrameParts::OnContinuationStart(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnContinuationStart: " << header; + QUICHE_VLOG(1) << "OnContinuationStart: " << header; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::CONTINUATION)) << *this; opt_payload_length_ = header.payload_length; } void FrameParts::OnContinuationEnd() { - HTTP2_VLOG(1) << "OnContinuationEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnContinuationEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::CONTINUATION)) << *this; } void FrameParts::OnPadLength(size_t trailing_length) { - HTTP2_VLOG(1) << "OnPadLength: trailing_length=" << trailing_length; + QUICHE_VLOG(1) << "OnPadLength: trailing_length=" << trailing_length; ASSERT_TRUE(InPaddedFrame()) << *this; ASSERT_FALSE(opt_pad_length_); ASSERT_TRUE(opt_payload_length_); @@ -213,7 +213,7 @@ } void FrameParts::OnPadding(const char* pad, size_t skipped_length) { - HTTP2_VLOG(1) << "OnPadding: skipped_length=" << skipped_length; + QUICHE_VLOG(1) << "OnPadding: skipped_length=" << skipped_length; ASSERT_TRUE(InPaddedFrame()) << *this; ASSERT_TRUE(opt_pad_length_); ASSERT_TRUE(AppendString(absl::string_view(pad, skipped_length), &padding_, @@ -222,7 +222,7 @@ void FrameParts::OnRstStream(const Http2FrameHeader& header, Http2ErrorCode error_code) { - HTTP2_VLOG(1) << "OnRstStream: " << header << "; code=" << error_code; + QUICHE_VLOG(1) << "OnRstStream: " << header << "; code=" << error_code; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::RST_STREAM)) << *this; ASSERT_FALSE(opt_rst_stream_error_code_); opt_rst_stream_error_code_ = error_code; @@ -230,25 +230,25 @@ } void FrameParts::OnSettingsStart(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnSettingsStart: " << header; + QUICHE_VLOG(1) << "OnSettingsStart: " << header; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::SETTINGS)) << *this; ASSERT_EQ(0u, settings_.size()); ASSERT_FALSE(header.IsAck()) << header; } void FrameParts::OnSetting(const Http2SettingFields& setting_fields) { - HTTP2_VLOG(1) << "OnSetting: " << setting_fields; + QUICHE_VLOG(1) << "OnSetting: " << setting_fields; ASSERT_TRUE(InFrameOfType(Http2FrameType::SETTINGS)) << *this; settings_.push_back(setting_fields); } void FrameParts::OnSettingsEnd() { - HTTP2_VLOG(1) << "OnSettingsEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnSettingsEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::SETTINGS)) << *this; } void FrameParts::OnSettingsAck(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnSettingsAck: " << header; + QUICHE_VLOG(1) << "OnSettingsAck: " << header; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::SETTINGS)) << *this; ASSERT_EQ(0u, settings_.size()); ASSERT_TRUE(header.IsAck()); @@ -258,9 +258,9 @@ void FrameParts::OnPushPromiseStart(const Http2FrameHeader& header, const Http2PushPromiseFields& promise, size_t total_padding_length) { - HTTP2_VLOG(1) << "OnPushPromiseStart header: " << header - << "; promise: " << promise - << "; total_padding_length: " << total_padding_length; + QUICHE_VLOG(1) << "OnPushPromiseStart header: " << header + << "; promise: " << promise + << "; total_padding_length: " << total_padding_length; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PUSH_PROMISE)) << *this; ASSERT_GE(header.payload_length, Http2PushPromiseFields::EncodedSize()); opt_payload_length_ = @@ -276,13 +276,13 @@ } void FrameParts::OnPushPromiseEnd() { - HTTP2_VLOG(1) << "OnPushPromiseEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnPushPromiseEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::PUSH_PROMISE)) << *this; } void FrameParts::OnPing(const Http2FrameHeader& header, const Http2PingFields& ping) { - HTTP2_VLOG(1) << "OnPing header: " << header << " ping: " << ping; + QUICHE_VLOG(1) << "OnPing header: " << header << " ping: " << ping; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PING)) << *this; ASSERT_FALSE(header.IsAck()); ASSERT_FALSE(opt_ping_); @@ -292,7 +292,7 @@ void FrameParts::OnPingAck(const Http2FrameHeader& header, const Http2PingFields& ping) { - HTTP2_VLOG(1) << "OnPingAck header: " << header << " ping: " << ping; + QUICHE_VLOG(1) << "OnPingAck header: " << header << " ping: " << ping; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PING)) << *this; ASSERT_TRUE(header.IsAck()); ASSERT_FALSE(opt_ping_); @@ -302,7 +302,7 @@ void FrameParts::OnGoAwayStart(const Http2FrameHeader& header, const Http2GoAwayFields& goaway) { - HTTP2_VLOG(1) << "OnGoAwayStart: " << goaway; + QUICHE_VLOG(1) << "OnGoAwayStart: " << goaway; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::GOAWAY)) << *this; ASSERT_FALSE(opt_goaway_); opt_goaway_ = goaway; @@ -311,21 +311,21 @@ } void FrameParts::OnGoAwayOpaqueData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; + QUICHE_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; ASSERT_TRUE(InFrameOfType(Http2FrameType::GOAWAY)) << *this; ASSERT_TRUE(AppendString(absl::string_view(data, len), &payload_, &opt_payload_length_)); } void FrameParts::OnGoAwayEnd() { - HTTP2_VLOG(1) << "OnGoAwayEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnGoAwayEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::GOAWAY)) << *this; } void FrameParts::OnWindowUpdate(const Http2FrameHeader& header, uint32_t increment) { - HTTP2_VLOG(1) << "OnWindowUpdate header: " << header - << " increment=" << increment; + QUICHE_VLOG(1) << "OnWindowUpdate header: " << header + << " increment=" << increment; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::WINDOW_UPDATE)) << *this; ASSERT_FALSE(opt_window_update_increment_); opt_window_update_increment_ = increment; @@ -334,9 +334,9 @@ void FrameParts::OnAltSvcStart(const Http2FrameHeader& header, size_t origin_length, size_t value_length) { - HTTP2_VLOG(1) << "OnAltSvcStart: " << header - << " origin_length: " << origin_length - << " value_length: " << value_length; + QUICHE_VLOG(1) << "OnAltSvcStart: " << header + << " origin_length: " << origin_length + << " value_length: " << value_length; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::ALTSVC)) << *this; ASSERT_FALSE(opt_altsvc_origin_length_); opt_altsvc_origin_length_ = origin_length; @@ -345,30 +345,30 @@ } void FrameParts::OnAltSvcOriginData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnAltSvcOriginData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcOriginData: len=" << len; ASSERT_TRUE(InFrameOfType(Http2FrameType::ALTSVC)) << *this; ASSERT_TRUE(AppendString(absl::string_view(data, len), &altsvc_origin_, &opt_altsvc_origin_length_)); } void FrameParts::OnAltSvcValueData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnAltSvcValueData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcValueData: len=" << len; ASSERT_TRUE(InFrameOfType(Http2FrameType::ALTSVC)) << *this; ASSERT_TRUE(AppendString(absl::string_view(data, len), &altsvc_value_, &opt_altsvc_value_length_)); } void FrameParts::OnAltSvcEnd() { - HTTP2_VLOG(1) << "OnAltSvcEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnAltSvcEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::ALTSVC)) << *this; } void FrameParts::OnPriorityUpdateStart( const Http2FrameHeader& header, const Http2PriorityUpdateFields& priority_update) { - HTTP2_VLOG(1) << "OnPriorityUpdateStart: " << header - << " prioritized_stream_id: " - << priority_update.prioritized_stream_id; + QUICHE_VLOG(1) << "OnPriorityUpdateStart: " << header + << " prioritized_stream_id: " + << priority_update.prioritized_stream_id; ASSERT_TRUE(StartFrameOfType(header, Http2FrameType::PRIORITY_UPDATE)) << *this; ASSERT_FALSE(opt_priority_update_); @@ -378,18 +378,18 @@ } void FrameParts::OnPriorityUpdatePayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnPriorityUpdatePayload: len=" << len; + QUICHE_VLOG(1) << "OnPriorityUpdatePayload: len=" << len; ASSERT_TRUE(InFrameOfType(Http2FrameType::PRIORITY_UPDATE)) << *this; payload_.append(data, len); } void FrameParts::OnPriorityUpdateEnd() { - HTTP2_VLOG(1) << "OnPriorityUpdateEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnPriorityUpdateEnd; frame_header_: " << frame_header_; ASSERT_TRUE(EndFrameOfType(Http2FrameType::PRIORITY_UPDATE)) << *this; } void FrameParts::OnUnknownStart(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnUnknownStart: " << header; + QUICHE_VLOG(1) << "OnUnknownStart: " << header; ASSERT_FALSE(IsSupportedHttp2FrameType(header.type)) << header; ASSERT_FALSE(got_start_callback_); ASSERT_EQ(frame_header_, header); @@ -398,7 +398,7 @@ } void FrameParts::OnUnknownPayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnUnknownPayload: len=" << len; + QUICHE_VLOG(1) << "OnUnknownPayload: len=" << len; ASSERT_FALSE(IsSupportedHttp2FrameType(frame_header_.type)) << *this; ASSERT_TRUE(got_start_callback_); ASSERT_FALSE(got_end_callback_); @@ -407,7 +407,7 @@ } void FrameParts::OnUnknownEnd() { - HTTP2_VLOG(1) << "OnUnknownEnd; frame_header_: " << frame_header_; + QUICHE_VLOG(1) << "OnUnknownEnd; frame_header_: " << frame_header_; ASSERT_FALSE(IsSupportedHttp2FrameType(frame_header_.type)) << *this; ASSERT_TRUE(got_start_callback_); ASSERT_FALSE(got_end_callback_); @@ -416,8 +416,8 @@ void FrameParts::OnPaddingTooLong(const Http2FrameHeader& header, size_t missing_length) { - HTTP2_VLOG(1) << "OnPaddingTooLong: " << header - << "; missing_length: " << missing_length; + QUICHE_VLOG(1) << "OnPaddingTooLong: " << header + << "; missing_length: " << missing_length; ASSERT_EQ(frame_header_, header); ASSERT_FALSE(got_end_callback_); ASSERT_TRUE(FrameIsPadded(header)); @@ -429,7 +429,7 @@ } void FrameParts::OnFrameSizeError(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; ASSERT_EQ(frame_header_, header); ASSERT_FALSE(got_end_callback_); ASSERT_FALSE(has_frame_size_error_);
diff --git a/quiche/http2/test_tools/frame_parts.h b/quiche/http2/test_tools/frame_parts.h index a9abe90..d116228 100644 --- a/quiche/http2/test_tools/frame_parts.h +++ b/quiche/http2/test_tools/frame_parts.h
@@ -21,8 +21,8 @@ #include "quiche/http2/decoder/http2_frame_decoder_listener.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 {
diff --git a/quiche/http2/test_tools/frame_parts_collector.cc b/quiche/http2/test_tools/frame_parts_collector.cc index 6f986cd..f9de389 100644 --- a/quiche/http2/test_tools/frame_parts_collector.cc +++ b/quiche/http2/test_tools/frame_parts_collector.cc
@@ -7,7 +7,7 @@ #include <utility> #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 {
diff --git a/quiche/http2/test_tools/frame_parts_collector_listener.cc b/quiche/http2/test_tools/frame_parts_collector_listener.cc index f5f9061..21327a0 100644 --- a/quiche/http2/test_tools/frame_parts_collector_listener.cc +++ b/quiche/http2/test_tools/frame_parts_collector_listener.cc
@@ -4,7 +4,7 @@ #include "quiche/http2/test_tools/frame_parts_collector_listener.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 { @@ -12,87 +12,87 @@ bool FramePartsCollectorListener::OnFrameHeader( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnFrameHeader: " << header; + QUICHE_VLOG(1) << "OnFrameHeader: " << header; ExpectFrameHeader(header); return true; } void FramePartsCollectorListener::OnDataStart(const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnDataStart: " << header; + QUICHE_VLOG(1) << "OnDataStart: " << header; StartFrame(header)->OnDataStart(header); } void FramePartsCollectorListener::OnDataPayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnDataPayload: len=" << len; + QUICHE_VLOG(1) << "OnDataPayload: len=" << len; CurrentFrame()->OnDataPayload(data, len); } void FramePartsCollectorListener::OnDataEnd() { - HTTP2_VLOG(1) << "OnDataEnd"; + QUICHE_VLOG(1) << "OnDataEnd"; EndFrame()->OnDataEnd(); } void FramePartsCollectorListener::OnHeadersStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnHeadersStart: " << header; + QUICHE_VLOG(1) << "OnHeadersStart: " << header; StartFrame(header)->OnHeadersStart(header); } void FramePartsCollectorListener::OnHeadersPriority( const Http2PriorityFields& priority) { - HTTP2_VLOG(1) << "OnHeadersPriority: " << priority; + QUICHE_VLOG(1) << "OnHeadersPriority: " << priority; CurrentFrame()->OnHeadersPriority(priority); } void FramePartsCollectorListener::OnHpackFragment(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnHpackFragment: len=" << len; + QUICHE_VLOG(1) << "OnHpackFragment: len=" << len; CurrentFrame()->OnHpackFragment(data, len); } void FramePartsCollectorListener::OnHeadersEnd() { - HTTP2_VLOG(1) << "OnHeadersEnd"; + QUICHE_VLOG(1) << "OnHeadersEnd"; EndFrame()->OnHeadersEnd(); } void FramePartsCollectorListener::OnPriorityFrame( const Http2FrameHeader& header, const Http2PriorityFields& priority_fields) { - HTTP2_VLOG(1) << "OnPriority: " << header << "; " << priority_fields; + QUICHE_VLOG(1) << "OnPriority: " << header << "; " << priority_fields; StartAndEndFrame(header)->OnPriorityFrame(header, priority_fields); } void FramePartsCollectorListener::OnContinuationStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnContinuationStart: " << header; + QUICHE_VLOG(1) << "OnContinuationStart: " << header; StartFrame(header)->OnContinuationStart(header); } void FramePartsCollectorListener::OnContinuationEnd() { - HTTP2_VLOG(1) << "OnContinuationEnd"; + QUICHE_VLOG(1) << "OnContinuationEnd"; EndFrame()->OnContinuationEnd(); } void FramePartsCollectorListener::OnPadLength(size_t pad_length) { - HTTP2_VLOG(1) << "OnPadLength: " << pad_length; + QUICHE_VLOG(1) << "OnPadLength: " << pad_length; CurrentFrame()->OnPadLength(pad_length); } void FramePartsCollectorListener::OnPadding(const char* padding, size_t skipped_length) { - HTTP2_VLOG(1) << "OnPadding: " << skipped_length; + QUICHE_VLOG(1) << "OnPadding: " << skipped_length; CurrentFrame()->OnPadding(padding, skipped_length); } void FramePartsCollectorListener::OnRstStream(const Http2FrameHeader& header, Http2ErrorCode error_code) { - HTTP2_VLOG(1) << "OnRstStream: " << header << "; error_code=" << error_code; + QUICHE_VLOG(1) << "OnRstStream: " << header << "; error_code=" << error_code; StartAndEndFrame(header)->OnRstStream(header, error_code); } void FramePartsCollectorListener::OnSettingsStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnSettingsStart: " << header; + QUICHE_VLOG(1) << "OnSettingsStart: " << header; EXPECT_EQ(Http2FrameType::SETTINGS, header.type) << header; EXPECT_EQ(Http2FrameFlag(), header.flags) << header; StartFrame(header)->OnSettingsStart(header); @@ -100,69 +100,70 @@ void FramePartsCollectorListener::OnSetting( const Http2SettingFields& setting_fields) { - HTTP2_VLOG(1) << "Http2SettingFields: setting_fields=" << setting_fields; + QUICHE_VLOG(1) << "Http2SettingFields: setting_fields=" << setting_fields; CurrentFrame()->OnSetting(setting_fields); } void FramePartsCollectorListener::OnSettingsEnd() { - HTTP2_VLOG(1) << "OnSettingsEnd"; + QUICHE_VLOG(1) << "OnSettingsEnd"; EndFrame()->OnSettingsEnd(); } void FramePartsCollectorListener::OnSettingsAck( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnSettingsAck: " << header; + QUICHE_VLOG(1) << "OnSettingsAck: " << header; StartAndEndFrame(header)->OnSettingsAck(header); } void FramePartsCollectorListener::OnPushPromiseStart( const Http2FrameHeader& header, const Http2PushPromiseFields& promise, size_t total_padding_length) { - HTTP2_VLOG(1) << "OnPushPromiseStart header: " << header - << " promise: " << promise - << " total_padding_length: " << total_padding_length; + QUICHE_VLOG(1) << "OnPushPromiseStart header: " << header + << " promise: " << promise + << " total_padding_length: " << total_padding_length; EXPECT_EQ(Http2FrameType::PUSH_PROMISE, header.type); StartFrame(header)->OnPushPromiseStart(header, promise, total_padding_length); } void FramePartsCollectorListener::OnPushPromiseEnd() { - HTTP2_VLOG(1) << "OnPushPromiseEnd"; + QUICHE_VLOG(1) << "OnPushPromiseEnd"; EndFrame()->OnPushPromiseEnd(); } void FramePartsCollectorListener::OnPing(const Http2FrameHeader& header, const Http2PingFields& ping) { - HTTP2_VLOG(1) << "OnPing: " << header << "; " << ping; + QUICHE_VLOG(1) << "OnPing: " << header << "; " << ping; StartAndEndFrame(header)->OnPing(header, ping); } void FramePartsCollectorListener::OnPingAck(const Http2FrameHeader& header, const Http2PingFields& ping) { - HTTP2_VLOG(1) << "OnPingAck: " << header << "; " << ping; + QUICHE_VLOG(1) << "OnPingAck: " << header << "; " << ping; StartAndEndFrame(header)->OnPingAck(header, ping); } void FramePartsCollectorListener::OnGoAwayStart( const Http2FrameHeader& header, const Http2GoAwayFields& goaway) { - HTTP2_VLOG(1) << "OnGoAwayStart header: " << header << "; goaway: " << goaway; + QUICHE_VLOG(1) << "OnGoAwayStart header: " << header + << "; goaway: " << goaway; StartFrame(header)->OnGoAwayStart(header, goaway); } void FramePartsCollectorListener::OnGoAwayOpaqueData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; + QUICHE_VLOG(1) << "OnGoAwayOpaqueData: len=" << len; CurrentFrame()->OnGoAwayOpaqueData(data, len); } void FramePartsCollectorListener::OnGoAwayEnd() { - HTTP2_VLOG(1) << "OnGoAwayEnd"; + QUICHE_VLOG(1) << "OnGoAwayEnd"; EndFrame()->OnGoAwayEnd(); } void FramePartsCollectorListener::OnWindowUpdate( const Http2FrameHeader& header, uint32_t window_size_increment) { - HTTP2_VLOG(1) << "OnWindowUpdate: " << header - << "; window_size_increment=" << window_size_increment; + QUICHE_VLOG(1) << "OnWindowUpdate: " << header + << "; window_size_increment=" << window_size_increment; EXPECT_EQ(Http2FrameType::WINDOW_UPDATE, header.type); StartAndEndFrame(header)->OnWindowUpdate(header, window_size_increment); } @@ -170,75 +171,75 @@ void FramePartsCollectorListener::OnAltSvcStart(const Http2FrameHeader& header, size_t origin_length, size_t value_length) { - HTTP2_VLOG(1) << "OnAltSvcStart header: " << header - << "; origin_length=" << origin_length - << "; value_length=" << value_length; + QUICHE_VLOG(1) << "OnAltSvcStart header: " << header + << "; origin_length=" << origin_length + << "; value_length=" << value_length; StartFrame(header)->OnAltSvcStart(header, origin_length, value_length); } void FramePartsCollectorListener::OnAltSvcOriginData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnAltSvcOriginData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcOriginData: len=" << len; CurrentFrame()->OnAltSvcOriginData(data, len); } void FramePartsCollectorListener::OnAltSvcValueData(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnAltSvcValueData: len=" << len; + QUICHE_VLOG(1) << "OnAltSvcValueData: len=" << len; CurrentFrame()->OnAltSvcValueData(data, len); } void FramePartsCollectorListener::OnAltSvcEnd() { - HTTP2_VLOG(1) << "OnAltSvcEnd"; + QUICHE_VLOG(1) << "OnAltSvcEnd"; EndFrame()->OnAltSvcEnd(); } void FramePartsCollectorListener::OnPriorityUpdateStart( const Http2FrameHeader& header, const Http2PriorityUpdateFields& priority_update) { - HTTP2_VLOG(1) << "OnPriorityUpdateStart header: " << header - << "; priority_update=" << priority_update; + QUICHE_VLOG(1) << "OnPriorityUpdateStart header: " << header + << "; priority_update=" << priority_update; StartFrame(header)->OnPriorityUpdateStart(header, priority_update); } void FramePartsCollectorListener::OnPriorityUpdatePayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnPriorityUpdatePayload: len=" << len; + QUICHE_VLOG(1) << "OnPriorityUpdatePayload: len=" << len; CurrentFrame()->OnPriorityUpdatePayload(data, len); } void FramePartsCollectorListener::OnPriorityUpdateEnd() { - HTTP2_VLOG(1) << "OnPriorityUpdateEnd"; + QUICHE_VLOG(1) << "OnPriorityUpdateEnd"; EndFrame()->OnPriorityUpdateEnd(); } void FramePartsCollectorListener::OnUnknownStart( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnUnknownStart: " << header; + QUICHE_VLOG(1) << "OnUnknownStart: " << header; StartFrame(header)->OnUnknownStart(header); } void FramePartsCollectorListener::OnUnknownPayload(const char* data, size_t len) { - HTTP2_VLOG(1) << "OnUnknownPayload: len=" << len; + QUICHE_VLOG(1) << "OnUnknownPayload: len=" << len; CurrentFrame()->OnUnknownPayload(data, len); } void FramePartsCollectorListener::OnUnknownEnd() { - HTTP2_VLOG(1) << "OnUnknownEnd"; + QUICHE_VLOG(1) << "OnUnknownEnd"; EndFrame()->OnUnknownEnd(); } void FramePartsCollectorListener::OnPaddingTooLong( const Http2FrameHeader& header, size_t missing_length) { - HTTP2_VLOG(1) << "OnPaddingTooLong: " << header - << " missing_length: " << missing_length; + QUICHE_VLOG(1) << "OnPaddingTooLong: " << header + << " missing_length: " << missing_length; EndFrame()->OnPaddingTooLong(header, missing_length); } void FramePartsCollectorListener::OnFrameSizeError( const Http2FrameHeader& header) { - HTTP2_VLOG(1) << "OnFrameSizeError: " << header; + QUICHE_VLOG(1) << "OnFrameSizeError: " << header; FrameError(header)->OnFrameSizeError(header); }
diff --git a/quiche/http2/test_tools/http2_random.cc b/quiche/http2/test_tools/http2_random.cc index e1c97a3..8ef8f98 100644 --- a/quiche/http2/test_tools/http2_random.cc +++ b/quiche/http2/test_tools/http2_random.cc
@@ -1,9 +1,9 @@ #include "quiche/http2/test_tools/http2_random.h" #include "absl/strings/escaping.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "openssl/chacha.h" #include "openssl/rand.h" +#include "quiche/common/platform/api/quiche_logging.h" static const uint8_t kZeroNonce[12] = {0}; @@ -13,7 +13,7 @@ Http2Random::Http2Random() { RAND_bytes(key_, sizeof(key_)); - HTTP2_LOG(INFO) << "Initialized test RNG with the following key: " << Key(); + QUICHE_LOG(INFO) << "Initialized test RNG with the following key: " << Key(); } Http2Random::Http2Random(absl::string_view key) {
diff --git a/quiche/http2/tools/random_decoder_test.cc b/quiche/http2/tools/random_decoder_test.cc index d76facc..0ceb412 100644 --- a/quiche/http2/tools/random_decoder_test.cc +++ b/quiche/http2/tools/random_decoder_test.cc
@@ -12,7 +12,7 @@ #include "quiche/http2/decoder/decode_buffer.h" #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_logging.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h" @@ -29,14 +29,14 @@ const SelectSize& select_size) { DecodeStatus status = DecodeStatus::kDecodeInProgress; bool first = true; - HTTP2_VLOG(2) << "DecodeSegments: input size=" << original->Remaining(); + QUICHE_VLOG(2) << "DecodeSegments: input size=" << original->Remaining(); while (first || original->HasData()) { size_t remaining = original->Remaining(); size_t size = std::min(remaining, select_size(first, original->Offset(), remaining)); DecodeBuffer db(original->cursor(), size); - HTTP2_VLOG(2) << "Decoding " << size << " bytes of " << remaining - << " remaining"; + QUICHE_VLOG(2) << "Decoding " << size << " bytes of " << remaining + << " remaining"; if (first) { first = false; status = StartDecoding(&db); @@ -74,13 +74,13 @@ DecodeBuffer* original, bool return_non_zero_on_first, const Validator& validator) { const uint32_t original_remaining = original->Remaining(); - HTTP2_VLOG(1) << "DecodeAndValidateSeveralWays - Start, remaining = " - << original_remaining; + QUICHE_VLOG(1) << "DecodeAndValidateSeveralWays - Start, remaining = " + << original_remaining; uint32_t first_consumed; { // Fast decode (no stopping unless decoder does so). DecodeBuffer input(original->cursor(), original_remaining); - HTTP2_VLOG(2) << "DecodeSegmentsAndValidate with SelectRemaining"; + QUICHE_VLOG(2) << "DecodeSegmentsAndValidate with SelectRemaining"; VERIFY_SUCCESS( DecodeSegmentsAndValidate(&input, SelectRemaining(), validator)) << "\nFailed with SelectRemaining; input.Offset=" << input.Offset() @@ -90,7 +90,7 @@ if (original_remaining <= 30) { // Decode again, one byte at a time. DecodeBuffer input(original->cursor(), original_remaining); - HTTP2_VLOG(2) << "DecodeSegmentsAndValidate with SelectOne"; + QUICHE_VLOG(2) << "DecodeSegmentsAndValidate with SelectOne"; VERIFY_SUCCESS(DecodeSegmentsAndValidate(&input, SelectOne(), validator)) << "\nFailed with SelectOne; input.Offset=" << input.Offset() << "; input.Remaining=" << input.Remaining(); @@ -99,7 +99,7 @@ if (original_remaining <= 20) { // Decode again, one or zero bytes at a time. DecodeBuffer input(original->cursor(), original_remaining); - HTTP2_VLOG(2) << "DecodeSegmentsAndValidate with SelectZeroAndOne"; + QUICHE_VLOG(2) << "DecodeSegmentsAndValidate with SelectZeroAndOne"; VERIFY_SUCCESS(DecodeSegmentsAndValidate( &input, SelectZeroAndOne(return_non_zero_on_first), validator)) << "\nFailed with SelectZeroAndOne"; @@ -110,7 +110,7 @@ { // Decode again, with randomly selected segment sizes. DecodeBuffer input(original->cursor(), original_remaining); - HTTP2_VLOG(2) << "DecodeSegmentsAndValidate with SelectRandom"; + QUICHE_VLOG(2) << "DecodeSegmentsAndValidate with SelectRandom"; VERIFY_SUCCESS(DecodeSegmentsAndValidate( &input, SelectRandom(return_non_zero_on_first), validator)) << "\nFailed with SelectRandom; input.Offset=" << input.Offset() @@ -119,7 +119,7 @@ } VERIFY_EQ(original_remaining, original->Remaining()); original->AdvanceCursor(first_consumed); - HTTP2_VLOG(1) << "DecodeAndValidateSeveralWays - SUCCESS"; + QUICHE_VLOG(1) << "DecodeAndValidateSeveralWays - SUCCESS"; return ::testing::AssertionSuccess(); }
diff --git a/quiche/http2/tools/random_decoder_test.h b/quiche/http2/tools/random_decoder_test.h index a11f379..852968a 100644 --- a/quiche/http2/tools/random_decoder_test.h +++ b/quiche/http2/tools/random_decoder_test.h
@@ -20,9 +20,9 @@ #include "absl/strings/string_view.h" #include "quiche/http2/decoder/decode_buffer.h" #include "quiche/http2/decoder/decode_status.h" -#include "quiche/http2/platform/api/http2_logging.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/common/platform/api/quiche_export.h" +#include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" #include "quiche/common/platform/api/quiche_test_helpers.h"