Make SPDY logging use QUICHE logging
Also replace (D)CHECK with QUICHE_(D)CHECK.
PiperOrigin-RevId: 355027342
Change-Id: I34991423c2679c0f045aba870509dfa57674f556
diff --git a/spdy/core/spdy_framer.cc b/spdy/core/spdy_framer.cc
index b70f796..22d3fff 100644
--- a/spdy/core/spdy_framer.cc
+++ b/spdy/core/spdy_framer.cc
@@ -105,7 +105,7 @@
bool ret = builder.BeginNewFrame(
SpdyFrameType::HEADERS, SerializeHeaderFrameFlags(headers, end_headers),
headers.stream_id(), frame_size - kFrameHeaderSize);
- DCHECK_EQ(kFrameHeaderSize, builder.length());
+ QUICHE_DCHECK_EQ(kFrameHeaderSize, builder.length());
if (ret && headers.padded()) {
ret &= builder.WriteUInt8(headers.padding_payload_len());
@@ -449,7 +449,7 @@
std::string padding(data_ir.padding_payload_len(), 0);
builder.WriteBytes(padding.data(), padding.length());
}
- DCHECK_EQ(size_with_padding, builder.length());
+ QUICHE_DCHECK_EQ(size_with_padding, builder.length());
return builder.take();
}
@@ -468,7 +468,7 @@
if (data_ir.padded()) {
builder.WriteUInt8(data_ir.padding_payload_len() & 0xff);
}
- DCHECK_EQ(frame_size, builder.length());
+ QUICHE_DCHECK_EQ(frame_size, builder.length());
return builder.take();
}
@@ -481,7 +481,7 @@
builder.WriteUInt32(rst_stream.error_code());
- DCHECK_EQ(expected_length, builder.length());
+ QUICHE_DCHECK_EQ(expected_length, builder.length());
return builder.take();
}
@@ -500,14 +500,14 @@
return builder.take();
}
- DCHECK_EQ(kSettingsFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_EQ(kSettingsFrameMinimumSize, builder.length());
for (auto it = values->begin(); it != values->end(); ++it) {
int setting_id = it->first;
- DCHECK_GE(setting_id, 0);
+ QUICHE_DCHECK_GE(setting_id, 0);
builder.WriteUInt16(static_cast<SpdySettingsId>(setting_id));
builder.WriteUInt32(it->second);
}
- DCHECK_EQ(size, builder.length());
+ QUICHE_DCHECK_EQ(size, builder.length());
return builder.take();
}
@@ -519,7 +519,7 @@
}
builder.BeginNewFrame(SpdyFrameType::PING, flags, 0);
builder.WriteUInt64(ping.id());
- DCHECK_EQ(kPingFrameSize, builder.length());
+ QUICHE_DCHECK_EQ(kPingFrameSize, builder.length());
return builder.take();
}
@@ -545,7 +545,7 @@
goaway.description().size());
}
- DCHECK_EQ(expected_length, builder.length());
+ QUICHE_DCHECK_EQ(expected_length, builder.length());
return builder.take();
}
@@ -618,7 +618,7 @@
builder.BeginNewFrame(SpdyFrameType::HEADERS, flags, headers.stream_id(),
length_field);
- DCHECK_EQ(kHeadersFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_EQ(kHeadersFrameMinimumSize, builder.length());
int padding_payload_len = 0;
if (headers.padded()) {
@@ -651,7 +651,7 @@
builder.BeginNewFrame(SpdyFrameType::WINDOW_UPDATE, kNoFlags,
window_update.stream_id());
builder.WriteUInt32(window_update.delta());
- DCHECK_EQ(kWindowUpdateFrameSize, builder.length());
+ QUICHE_DCHECK_EQ(kWindowUpdateFrameSize, builder.length());
return builder.take();
}
@@ -699,13 +699,13 @@
if (push_promise.padded()) {
builder.WriteUInt8(push_promise.padding_payload_len());
builder.WriteUInt32(push_promise.promised_stream_id());
- DCHECK_EQ(kPushPromiseFrameMinimumSize + kPadLengthFieldSize,
- builder.length());
+ QUICHE_DCHECK_EQ(kPushPromiseFrameMinimumSize + kPadLengthFieldSize,
+ builder.length());
padding_payload_len = push_promise.padding_payload_len();
} else {
builder.WriteUInt32(push_promise.promised_stream_id());
- DCHECK_EQ(kPushPromiseFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_EQ(kPushPromiseFrameMinimumSize, builder.length());
}
WritePayloadWithContinuation(
@@ -731,7 +731,7 @@
uint8_t flags = continuation.end_headers() ? HEADERS_FLAG_END_HEADERS : 0;
builder.BeginNewFrame(SpdyFrameType::CONTINUATION, flags,
continuation.stream_id());
- DCHECK_EQ(kFrameHeaderSize, builder.length());
+ QUICHE_DCHECK_EQ(kFrameHeaderSize, builder.length());
builder.WriteBytes(encoding.data(), encoding.size());
return builder.take();
@@ -747,7 +747,7 @@
builder.WriteUInt16(altsvc_ir.origin().length());
builder.WriteBytes(altsvc_ir.origin().data(), altsvc_ir.origin().length());
builder.WriteBytes(value.data(), value.length());
- DCHECK_LT(kGetAltSvcFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_LT(kGetAltSvcFrameMinimumSize, builder.length());
return builder.take();
}
@@ -761,7 +761,7 @@
priority.parent_stream_id()));
// Per RFC 7540 section 6.3, serialized weight value is actual value - 1.
builder.WriteUInt8(priority.weight() - 1);
- DCHECK_EQ(kPriorityFrameSize, builder.length());
+ QUICHE_DCHECK_EQ(kPriorityFrameSize, builder.length());
return builder.take();
}
@@ -776,7 +776,7 @@
builder.WriteUInt32(priority_update.prioritized_stream_id());
builder.WriteBytes(priority_update.priority_field_value().data(),
priority_update.priority_field_value().size());
- DCHECK_EQ(total_size, builder.length());
+ QUICHE_DCHECK_EQ(total_size, builder.length());
return builder.take();
}
@@ -970,7 +970,7 @@
padding = std::string(data_ir.padding_payload_len(), 0);
ok = ok && builder.WriteBytes(padding.data(), padding.length());
}
- DCHECK_EQ(size_with_padding, builder.length());
+ QUICHE_DCHECK_EQ(size_with_padding, builder.length());
return ok;
}
@@ -992,7 +992,7 @@
if (data_ir.padded()) {
ok = ok && builder.WriteUInt8(data_ir.padding_payload_len() & 0xff);
}
- DCHECK_EQ(frame_size, builder.length());
+ QUICHE_DCHECK_EQ(frame_size, builder.length());
return ok;
}
@@ -1004,7 +1004,7 @@
rst_stream.stream_id());
ok = ok && builder.WriteUInt32(rst_stream.error_code());
- DCHECK_EQ(expected_length, builder.length());
+ QUICHE_DCHECK_EQ(expected_length, builder.length());
return ok;
}
@@ -1023,14 +1023,14 @@
return ok;
}
- DCHECK_EQ(kSettingsFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_EQ(kSettingsFrameMinimumSize, builder.length());
for (auto it = values->begin(); it != values->end(); ++it) {
int setting_id = it->first;
- DCHECK_GE(setting_id, 0);
+ QUICHE_DCHECK_GE(setting_id, 0);
ok = ok && builder.WriteUInt16(static_cast<SpdySettingsId>(setting_id)) &&
builder.WriteUInt32(it->second);
}
- DCHECK_EQ(size, builder.length());
+ QUICHE_DCHECK_EQ(size, builder.length());
return ok;
}
@@ -1043,7 +1043,7 @@
}
bool ok = builder.BeginNewFrame(SpdyFrameType::PING, flags, 0);
ok = ok && builder.WriteUInt64(ping.id());
- DCHECK_EQ(kPingFrameSize, builder.length());
+ QUICHE_DCHECK_EQ(kPingFrameSize, builder.length());
return ok;
}
@@ -1068,7 +1068,7 @@
goaway.description().size());
}
- DCHECK_EQ(expected_length, builder.length());
+ QUICHE_DCHECK_EQ(expected_length, builder.length());
return ok;
}
@@ -1088,7 +1088,7 @@
SpdyFrameBuilder builder(size, output);
ok = ok && builder.BeginNewFrame(SpdyFrameType::HEADERS, flags,
headers.stream_id(), length_field);
- DCHECK_EQ(kHeadersFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_EQ(kHeadersFrameMinimumSize, builder.length());
int padding_payload_len = 0;
if (headers.padded()) {
@@ -1123,7 +1123,7 @@
bool ok = builder.BeginNewFrame(SpdyFrameType::WINDOW_UPDATE, kNoFlags,
window_update.stream_id());
ok = ok && builder.WriteUInt32(window_update.delta());
- DCHECK_EQ(kWindowUpdateFrameSize, builder.length());
+ QUICHE_DCHECK_EQ(kWindowUpdateFrameSize, builder.length());
return ok;
}
@@ -1146,13 +1146,13 @@
if (push_promise.padded()) {
ok = ok && builder.WriteUInt8(push_promise.padding_payload_len()) &&
builder.WriteUInt32(push_promise.promised_stream_id());
- DCHECK_EQ(kPushPromiseFrameMinimumSize + kPadLengthFieldSize,
- builder.length());
+ QUICHE_DCHECK_EQ(kPushPromiseFrameMinimumSize + kPadLengthFieldSize,
+ builder.length());
padding_payload_len = push_promise.padding_payload_len();
} else {
ok = ok && builder.WriteUInt32(push_promise.promised_stream_id());
- DCHECK_EQ(kPushPromiseFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_EQ(kPushPromiseFrameMinimumSize, builder.length());
}
ok = ok && WritePayloadWithContinuation(
@@ -1179,7 +1179,7 @@
bool ok = builder.BeginNewFrame(SpdyFrameType::CONTINUATION, flags,
continuation.stream_id(),
frame_size - kFrameHeaderSize);
- DCHECK_EQ(kFrameHeaderSize, builder.length());
+ QUICHE_DCHECK_EQ(kFrameHeaderSize, builder.length());
ok = ok && builder.WriteBytes(encoding.data(), encoding.size());
return ok;
@@ -1197,7 +1197,7 @@
builder.WriteBytes(altsvc_ir.origin().data(),
altsvc_ir.origin().length()) &&
builder.WriteBytes(value.data(), value.length());
- DCHECK_LT(kGetAltSvcFrameMinimumSize, builder.length());
+ QUICHE_DCHECK_LT(kGetAltSvcFrameMinimumSize, builder.length());
return ok;
}
@@ -1211,7 +1211,7 @@
priority.exclusive(), priority.parent_stream_id())) &&
// Per RFC 7540 section 6.3, serialized weight value is actual value - 1.
builder.WriteUInt8(priority.weight() - 1);
- DCHECK_EQ(kPriorityFrameSize, builder.length());
+ QUICHE_DCHECK_EQ(kPriorityFrameSize, builder.length());
return ok;
}
@@ -1227,7 +1227,7 @@
ok = ok && builder.WriteUInt32(priority_update.prioritized_stream_id());
ok = ok && builder.WriteBytes(priority_update.priority_field_value().data(),
priority_update.priority_field_value().size());
- DCHECK_EQ(total_size, builder.length());
+ QUICHE_DCHECK_EQ(total_size, builder.length());
return ok;
}
