diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-07-03 11:25:41 -0700 |
|---|---|---|
| committer |  Noah Eisen <ncteisen@google.com> | 2018-07-06 15:34:55 -0700 |
| commit | caa85b2a4340c54904a41f1c2fc1ffc17e7f8dbb (patch) | |
| tree | e32eacdf53c20aa827889cc7db93989a37329feb /src/core/lib/channel | |
| parent | c9c1feffca295ea9b6232c40d6ac09c5b82343d5 (diff) | |
Reviewer feedback
Diffstat (limited to 'src/core/lib/channel')
| -rw-r--r-- | src/core/lib/channel/channelz.cc | 5 | ||||
| -rw-r--r-- | src/core/lib/channel/channelz.h | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc index 0f13551c2a..2074cb0cc5 100644 --- a/src/core/lib/channel/channelz.cc +++ b/src/core/lib/channel/channelz.cc @@ -129,7 +129,6 @@ char* ChannelNode::RenderJSON() { GRPC_JSON_OBJECT, false); json = data; json_iterator = nullptr; - PopulateConnectivityState(json); json_iterator = grpc_json_create_child( json_iterator, json, "target", target_.get(), GRPC_JSON_STRING, false); @@ -166,8 +165,8 @@ char* ChannelNode::RenderJSON() { return json_str; } -RefCountedPtr<ChannelNode> MakeChannelNode(grpc_channel* channel, - size_t channel_tracer_max_nodes) { +RefCountedPtr<ChannelNode> ChannelNode::MakeChannelNode( + grpc_channel* channel, size_t channel_tracer_max_nodes) { return MakeRefCounted<grpc_core::channelz::ChannelNode>( channel, channel_tracer_max_nodes); } diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h index e14e1b73cb..9bd01ece50 100644 --- a/src/core/lib/channel/channelz.h +++ b/src/core/lib/channel/channelz.h @@ -44,8 +44,8 @@ class ChannelNodePeer; class ChannelNode : public RefCounted<ChannelNode> { public: - ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes); - virtual ~ChannelNode(); + static RefCountedPtr<ChannelNode> MakeChannelNode( + grpc_channel* channel, size_t channel_tracer_max_nodes); void RecordCallStarted(); void RecordCallFailed() { @@ -73,6 +73,12 @@ class ChannelNode : public RefCounted<ChannelNode> { intptr_t channel_uuid() { return channel_uuid_; } + protected: + GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE + GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW + ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes); + virtual ~ChannelNode(); + private: // testing peer friend. friend class testing::ChannelNodePeer; @@ -92,9 +98,6 @@ class ChannelNode : public RefCounted<ChannelNode> { typedef RefCountedPtr<ChannelNode> (*ChannelNodeCreationFunc)(grpc_channel*, size_t); -RefCountedPtr<ChannelNode> MakeChannelNode(grpc_channel* channel, - size_t channel_tracer_max_nodes); - } // namespace channelz } // namespace grpc_core |