Replaces all flavors of SPDY_LOG with the QUICHE equivalents.
PiperOrigin-RevId: 367497148
Change-Id: I5a7092649df7d919d23bc80a3cd1f4002472fa22
diff --git a/http2/core/http2_priority_write_scheduler.h b/http2/core/http2_priority_write_scheduler.h
index 27e84ad..efc4d7f 100644
--- a/http2/core/http2_priority_write_scheduler.h
+++ b/http2/core/http2_priority_write_scheduler.h
@@ -20,10 +20,10 @@
#include "absl/strings/str_cat.h"
#include "http2/core/write_scheduler.h"
#include "common/platform/api/quiche_bug_tracker.h"
+#include "common/platform/api/quiche_logging.h"
#include "spdy/core/spdy_intrusive_list.h"
#include "spdy/core/spdy_protocol.h"
#include "spdy/platform/api/spdy_containers.h"
-#include "spdy/platform/api/spdy_logging.h"
#include "spdy/platform/api/spdy_string_utils.h"
namespace http2 {
@@ -233,8 +233,8 @@
StreamInfo* parent = FindStream(precedence.parent_id());
if (parent == nullptr) {
// parent_id may legitimately not be registered yet--see b/15676312.
- SPDY_VLOG(1) << "Parent stream " << precedence.parent_id()
- << " not registered";
+ QUICHE_VLOG(1) << "Parent stream " << precedence.parent_id()
+ << " not registered";
parent = root_stream_info_;
}
@@ -322,7 +322,7 @@
if (stream_info == nullptr) {
// Unknown streams tolerated due to b/15676312. However, return lowest
// weight.
- SPDY_VLOG(1) << "Stream " << stream_id << " not registered";
+ QUICHE_VLOG(1) << "Stream " << stream_id << " not registered";
return StreamPrecedenceType(spdy::kHttp2RootStreamId,
spdy::kHttp2MinStreamWeight, false);
}
@@ -364,7 +364,7 @@
StreamInfo* stream_info = FindStream(stream_id);
if (stream_info == nullptr) {
// TODO(mpw): add to all_stream_infos_ on demand--see b/15676312.
- SPDY_VLOG(1) << "Stream " << stream_id << " not registered";
+ QUICHE_VLOG(1) << "Stream " << stream_id << " not registered";
return;
}
UpdateStreamParent(stream_info, precedence.parent_id(),
@@ -400,7 +400,7 @@
StreamInfo* new_parent = FindStream(parent_id);
if (new_parent == nullptr) {
// parent_id may legitimately not be registered yet--see b/15676312.
- SPDY_VLOG(1) << "Parent stream " << parent_id << " not registered";
+ QUICHE_VLOG(1) << "Parent stream " << parent_id << " not registered";
return;
}
@@ -734,8 +734,8 @@
// Verify each StreamInfo mapped under the proper stream ID.
if (stream_id != stream_info.id) {
- SPDY_DLOG(INFO) << "Stream ID " << stream_id
- << " maps to StreamInfo with ID " << stream_info.id;
+ QUICHE_DLOG(INFO) << "Stream ID " << stream_id
+ << " maps to StreamInfo with ID " << stream_info.id;
return false;
}
@@ -743,9 +743,9 @@
// the children of that parent.
if (stream_info.id != spdy::kHttp2RootStreamId &&
!StreamHasChild(*stream_info.parent, &stream_info)) {
- SPDY_DLOG(INFO) << "Parent stream " << stream_info.parent->id
- << " is not registered, or does not list stream "
- << stream_info.id << " as its child.";
+ QUICHE_DLOG(INFO) << "Parent stream " << stream_info.parent->id
+ << " is not registered, or does not list stream "
+ << stream_info.id << " as its child.";
return false;
}
@@ -757,20 +757,19 @@
// Each stream in the list should exist and should have this stream
// set as its parent.
if (!StreamRegistered(child->id) || child->parent != &stream_info) {
- SPDY_DLOG(INFO) << "Child stream " << child->id
- << " is not registered, "
- << "or does not list " << stream_info.id
- << " as its parent.";
+ QUICHE_DLOG(INFO)
+ << "Child stream " << child->id << " is not registered, "
+ << "or does not list " << stream_info.id << " as its parent.";
return false;
}
total_child_weights += child->weight;
}
// Verify that total_child_weights is correct.
if (total_child_weights != stream_info.total_child_weights) {
- SPDY_DLOG(INFO) << "Child weight totals do not agree. For stream "
- << stream_info.id << " total_child_weights has value "
- << stream_info.total_child_weights << ", expected "
- << total_child_weights;
+ QUICHE_DLOG(INFO) << "Child weight totals do not agree. For stream "
+ << stream_info.id << " total_child_weights has value "
+ << stream_info.total_child_weights << ", expected "
+ << total_child_weights;
return false;
}
}
@@ -779,7 +778,7 @@
// Make sure NumRegisteredStreams() reflects the total number of streams the
// map contains.
if (total_streams != NumRegisteredStreams()) {
- SPDY_DLOG(INFO) << "Map contains incorrect number of streams.";
+ QUICHE_DLOG(INFO) << "Map contains incorrect number of streams.";
return false;
}
// Validate the validation function; we should have visited each stream twice
diff --git a/http2/core/priority_write_scheduler.h b/http2/core/priority_write_scheduler.h
index 1014050..b59e294 100644
--- a/http2/core/priority_write_scheduler.h
+++ b/http2/core/priority_write_scheduler.h
@@ -18,8 +18,8 @@
#include "absl/strings/str_cat.h"
#include "http2/core/write_scheduler.h"
#include "common/platform/api/quiche_bug_tracker.h"
+#include "common/platform/api/quiche_logging.h"
#include "spdy/core/spdy_protocol.h"
-#include "spdy/platform/api/spdy_logging.h"
namespace http2 {
@@ -56,8 +56,8 @@
// parent_id not used here, but may as well validate it. However,
// parent_id may legitimately not be registered yet--see b/15676312.
StreamIdType parent_id = precedence.parent_id();
- SPDY_DVLOG_IF(1,
- parent_id != root_stream_id_ && !StreamRegistered(parent_id))
+ QUICHE_DVLOG_IF(
+ 1, parent_id != root_stream_id_ && !StreamRegistered(parent_id))
<< "Parent stream " << parent_id << " not registered";
if (stream_id == root_stream_id_) {
@@ -95,7 +95,7 @@
StreamIdType stream_id) const override {
auto it = stream_infos_.find(stream_id);
if (it == stream_infos_.end()) {
- SPDY_DVLOG(1) << "Stream " << stream_id << " not registered";
+ QUICHE_DVLOG(1) << "Stream " << stream_id << " not registered";
return StreamPrecedenceType(spdy::kV3LowestPriority);
}
return StreamPrecedenceType(it->second.priority);
@@ -109,14 +109,14 @@
// parent_id not used here, but may as well validate it. However,
// parent_id may legitimately not be registered yet--see b/15676312.
StreamIdType parent_id = precedence.parent_id();
- SPDY_DVLOG_IF(1,
- parent_id != root_stream_id_ && !StreamRegistered(parent_id))
+ QUICHE_DVLOG_IF(
+ 1, parent_id != root_stream_id_ && !StreamRegistered(parent_id))
<< "Parent stream " << parent_id << " not registered";
auto it = stream_infos_.find(stream_id);
if (it == stream_infos_.end()) {
// TODO(mpw): add to stream_infos_ on demand--see b/15676312.
- SPDY_DVLOG(1) << "Stream " << stream_id << " not registered";
+ QUICHE_DVLOG(1) << "Stream " << stream_id << " not registered";
return;
}
StreamInfo& stream_info = it->second;
@@ -275,7 +275,7 @@
bool IsStreamReady(StreamIdType stream_id) const override {
auto it = stream_infos_.find(stream_id);
if (it == stream_infos_.end()) {
- SPDY_DLOG(INFO) << "Stream " << stream_id << " not registered";
+ QUICHE_DLOG(INFO) << "Stream " << stream_id << " not registered";
return false;
}
return it->second.ready;
