Name change

pull/24949/head
Donna Dionne 4 years ago
parent 96a11767a1
commit 57aa10f3e7
  1. 12
      src/core/ext/xds/xds_client.cc
  2. 2
      src/core/ext/xds/xds_client.h
  3. 4
      src/core/ext/xds/xds_client_stats.cc

@ -66,7 +66,7 @@
namespace grpc_core { namespace grpc_core {
TraceFlag grpc_xds_client_trace(false, "xds_client"); TraceFlag grpc_xds_client_trace(false, "xds_client");
TraceFlag grpc_xds_client_ref_count_trace(false, "xds_client_ref_count"); TraceFlag grpc_xds_client_refcount_trace(false, "xds_client_refcount");
namespace { namespace {
@ -461,7 +461,7 @@ grpc_channel* CreateXdsChannel(const XdsBootstrap::XdsServer& server) {
XdsClient::ChannelState::ChannelState(WeakRefCountedPtr<XdsClient> xds_client, XdsClient::ChannelState::ChannelState(WeakRefCountedPtr<XdsClient> xds_client,
const XdsBootstrap::XdsServer& server) const XdsBootstrap::XdsServer& server)
: InternallyRefCounted<ChannelState>( : InternallyRefCounted<ChannelState>(
GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_ref_count_trace) GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace)
? "ChannelState" ? "ChannelState"
: nullptr), : nullptr),
xds_client_(std::move(xds_client)), xds_client_(std::move(xds_client)),
@ -670,7 +670,7 @@ void XdsClient::ChannelState::RetryableCall<T>::OnRetryTimerLocked(
XdsClient::ChannelState::AdsCallState::AdsCallState( XdsClient::ChannelState::AdsCallState::AdsCallState(
RefCountedPtr<RetryableCall<AdsCallState>> parent) RefCountedPtr<RetryableCall<AdsCallState>> parent)
: InternallyRefCounted<AdsCallState>( : InternallyRefCounted<AdsCallState>(
GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_ref_count_trace) GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace)
? "AdsCallState" ? "AdsCallState"
: nullptr), : nullptr),
parent_(std::move(parent)) { parent_(std::move(parent)) {
@ -1423,7 +1423,7 @@ bool XdsClient::ChannelState::LrsCallState::Reporter::OnReportDoneLocked(
XdsClient::ChannelState::LrsCallState::LrsCallState( XdsClient::ChannelState::LrsCallState::LrsCallState(
RefCountedPtr<RetryableCall<LrsCallState>> parent) RefCountedPtr<RetryableCall<LrsCallState>> parent)
: InternallyRefCounted<LrsCallState>( : InternallyRefCounted<LrsCallState>(
GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_ref_count_trace) GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace)
? "LrsCallState" ? "LrsCallState"
: nullptr), : nullptr),
parent_(std::move(parent)) { parent_(std::move(parent)) {
@ -1737,8 +1737,8 @@ grpc_millis GetRequestTimeout() {
XdsClient::XdsClient(grpc_error** error) XdsClient::XdsClient(grpc_error** error)
: DualRefCounted<XdsClient>( : DualRefCounted<XdsClient>(
GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_ref_count_trace) ? "XdsClient" GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) ? "XdsClient"
: nullptr), : nullptr),
request_timeout_(GetRequestTimeout()), request_timeout_(GetRequestTimeout()),
interested_parties_(grpc_pollset_set_create()), interested_parties_(grpc_pollset_set_create()),
bootstrap_( bootstrap_(

@ -40,7 +40,7 @@
namespace grpc_core { namespace grpc_core {
extern TraceFlag grpc_xds_client_trace; extern TraceFlag grpc_xds_client_trace;
extern TraceFlag grpc_xds_client_ref_count_trace; extern TraceFlag grpc_xds_client_refcount_trace;
class XdsClient : public DualRefCounted<XdsClient> { class XdsClient : public DualRefCounted<XdsClient> {
public: public:

@ -45,7 +45,7 @@ XdsClusterDropStats::XdsClusterDropStats(RefCountedPtr<XdsClient> xds_client,
absl::string_view lrs_server_name, absl::string_view lrs_server_name,
absl::string_view cluster_name, absl::string_view cluster_name,
absl::string_view eds_service_name) absl::string_view eds_service_name)
: RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_ref_count_trace) : RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace)
? "XdsClusterDropStats" ? "XdsClusterDropStats"
: nullptr), : nullptr),
xds_client_(std::move(xds_client)), xds_client_(std::move(xds_client)),
@ -98,7 +98,7 @@ XdsClusterLocalityStats::XdsClusterLocalityStats(
RefCountedPtr<XdsClient> xds_client, absl::string_view lrs_server_name, RefCountedPtr<XdsClient> xds_client, absl::string_view lrs_server_name,
absl::string_view cluster_name, absl::string_view eds_service_name, absl::string_view cluster_name, absl::string_view eds_service_name,
RefCountedPtr<XdsLocalityName> name) RefCountedPtr<XdsLocalityName> name)
: RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_ref_count_trace) : RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace)
? "XdsClusterLocalityStats" ? "XdsClusterLocalityStats"
: nullptr), : nullptr),
xds_client_(std::move(xds_client)), xds_client_(std::move(xds_client)),

Loading…
Cancel
Save