aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/lib')
-rw-r--r--src/core/lib/channel/channelz.cc17
-rw-r--r--src/core/lib/channel/connected_channel.cc9
-rw-r--r--src/core/lib/channel/connected_channel.h3
-rw-r--r--src/core/lib/surface/server.cc31
-rw-r--r--src/core/lib/surface/server.h9
-rw-r--r--src/core/lib/transport/transport.cc4
-rw-r--r--src/core/lib/transport/transport.h3
-rw-r--r--src/core/lib/transport/transport_impl.h2
8 files changed, 25 insertions, 53 deletions
diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc
index 47ba1492ea..c384f99833 100644
--- a/src/core/lib/channel/channelz.cc
+++ b/src/core/lib/channel/channelz.cc
@@ -166,7 +166,7 @@ char* ServerNode::RenderServerSockets(intptr_t start_socket_id) {
// reserved). However, we want to support requests coming in with
// start_server_id=0, which signifies "give me everything."
size_t start_idx = start_socket_id == 0 ? 0 : start_socket_id - 1;
- grpc_server_populate_listen_sockets(server_, &socket_refs, start_idx);
+ grpc_server_populate_server_sockets(server_, &socket_refs, start_idx);
if (!socket_refs.empty()) {
// create list of socket refs
grpc_json* array_parent = grpc_json_create_child(
@@ -217,21 +217,6 @@ grpc_json* ServerNode::RenderJson() {
}
// ask CallCountingHelper to populate trace and call count data.
call_counter_.PopulateCallCounts(json);
- json = top_level_json;
- ChildRefsList listen_sockets;
- grpc_server_populate_listen_sockets(server_, &listen_sockets,
- 0 /* start_idx*/);
- if (!listen_sockets.empty()) {
- grpc_json* array_parent = grpc_json_create_child(
- nullptr, json, "listenSocket", nullptr, GRPC_JSON_ARRAY, false);
- for (size_t i = 0; i < listen_sockets.size(); ++i) {
- json_iterator =
- grpc_json_create_child(json_iterator, array_parent, nullptr, nullptr,
- GRPC_JSON_OBJECT, false);
- grpc_json_add_number_string_child(json_iterator, nullptr, "socketId",
- listen_sockets[i]);
- }
- }
return top_level_json;
}
diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc
index 88e734a8a0..e2ea334ded 100644
--- a/src/core/lib/channel/connected_channel.cc
+++ b/src/core/lib/channel/connected_channel.cc
@@ -36,7 +36,6 @@
typedef struct connected_channel_channel_data {
grpc_transport* transport;
- intptr_t socket_uuid;
} channel_data;
typedef struct {
@@ -218,7 +217,6 @@ static void bind_transport(grpc_channel_stack* channel_stack,
GPR_ASSERT(elem->filter == &grpc_connected_filter);
GPR_ASSERT(cd->transport == nullptr);
cd->transport = static_cast<grpc_transport*>(t);
- cd->socket_uuid = grpc_transport_get_socket_uuid(cd->transport);
/* HACK(ctiller): increase call stack size for the channel to make space
for channel data. We need a cleaner (but performant) way to do this,
@@ -239,13 +237,6 @@ bool grpc_add_connected_filter(grpc_channel_stack_builder* builder,
builder, &grpc_connected_filter, bind_transport, t);
}
-intptr_t grpc_connected_channel_get_socket_uuid(
- grpc_channel_element* connected_channel_elem) {
- channel_data* chand =
- static_cast<channel_data*>(connected_channel_elem->channel_data);
- return chand->socket_uuid;
-}
-
grpc_stream* grpc_connected_channel_get_stream(grpc_call_element* elem) {
call_data* calld = static_cast<call_data*>(elem->call_data);
return TRANSPORT_STREAM_FROM_CALL_DATA(calld);
diff --git a/src/core/lib/channel/connected_channel.h b/src/core/lib/channel/connected_channel.h
index b5389c4e4c..faa1c73a21 100644
--- a/src/core/lib/channel/connected_channel.h
+++ b/src/core/lib/channel/connected_channel.h
@@ -28,9 +28,6 @@ extern const grpc_channel_filter grpc_connected_filter;
bool grpc_add_connected_filter(grpc_channel_stack_builder* builder,
void* arg_must_be_null);
-intptr_t grpc_connected_channel_get_socket_uuid(
- grpc_channel_element* connected_channel_elem);
-
/* Debug helper to dig the transport stream out of a call element */
grpc_stream* grpc_connected_channel_get_stream(grpc_call_element* elem);
diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
index da643f54ef..54f921b0c2 100644
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@@ -104,6 +104,7 @@ struct channel_data {
uint32_t registered_method_max_probes;
grpc_closure finish_destroy_channel_closure;
grpc_closure channel_connectivity_changed;
+ uint32_t socket_uuid;
};
typedef struct shutdown_tag {
@@ -1116,9 +1117,9 @@ void grpc_server_get_pollsets(grpc_server* server, grpc_pollset*** pollsets,
*pollsets = server->pollsets;
}
-void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport,
- grpc_pollset* accepting_pollset,
- const grpc_channel_args* args) {
+void grpc_server_setup_transport_with_socket_uuid(
+ grpc_server* s, grpc_transport* transport, grpc_pollset* accepting_pollset,
+ const grpc_channel_args* args, intptr_t socket_uuid) {
size_t num_registered_methods;
size_t alloc;
registered_method* rm;
@@ -1138,6 +1139,7 @@ void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport,
chand->server = s;
server_ref(s);
chand->channel = channel;
+ chand->socket_uuid = socket_uuid;
size_t cq_idx;
for (cq_idx = 0; cq_idx < s->cq_count; cq_idx++) {
@@ -1212,21 +1214,22 @@ void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport,
grpc_transport_perform_op(transport, op);
}
-void grpc_server_populate_listen_sockets(
- grpc_server* s, grpc_core::ChildRefsList* listen_sockets,
+void grpc_server_setup_transport(grpc_server* s, grpc_transport* transport,
+ grpc_pollset* accepting_pollset,
+ const grpc_channel_args* args) {
+ grpc_server_setup_transport_with_socket_uuid(s, transport, accepting_pollset,
+ args, 0);
+}
+
+void grpc_server_populate_server_sockets(
+ grpc_server* s, grpc_core::ChildRefsList* server_sockets,
intptr_t start_idx) {
gpr_mu_lock(&s->mu_global);
channel_data* c = nullptr;
for (c = s->root_channel_data.next; c != &s->root_channel_data; c = c->next) {
- if (c->channel != nullptr) {
- grpc_channel_element* connected_channel_elem =
- grpc_channel_stack_last_element(
- grpc_channel_get_channel_stack(c->channel));
- intptr_t socket_uuid =
- grpc_connected_channel_get_socket_uuid(connected_channel_elem);
- if (socket_uuid >= start_idx) {
- listen_sockets->push_back(socket_uuid);
- }
+ intptr_t socket_uuid = c->socket_uuid;
+ if (socket_uuid >= start_idx) {
+ server_sockets->push_back(socket_uuid);
}
}
gpr_mu_unlock(&s->mu_global);
diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h
index b3fd45564e..62d444e57e 100644
--- a/src/core/lib/surface/server.h
+++ b/src/core/lib/surface/server.h
@@ -47,8 +47,13 @@ void grpc_server_setup_transport(grpc_server* server, grpc_transport* transport,
grpc_pollset* accepting_pollset,
const grpc_channel_args* args);
-void grpc_server_populate_listen_sockets(
- grpc_server* server, grpc_core::ChildRefsList* listen_sockets,
+void grpc_server_setup_transport_with_socket_uuid(
+ grpc_server* server, grpc_transport* transport,
+ grpc_pollset* accepting_pollset, const grpc_channel_args* args,
+ intptr_t socket_uuid);
+
+void grpc_server_populate_server_sockets(
+ grpc_server* server, grpc_core::ChildRefsList* server_sockets,
intptr_t start_idx);
grpc_core::channelz::ServerNode* grpc_server_get_channelz_node(
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
index c8fdbb4de2..cbdb77c844 100644
--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
@@ -199,10 +199,6 @@ grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport) {
return transport->vtable->get_endpoint(transport);
}
-intptr_t grpc_transport_get_socket_uuid(grpc_transport* transport) {
- return transport->vtable->get_socket_uuid(transport);
-}
-
// This comment should be sung to the tune of
// "Supercalifragilisticexpialidocious":
//
diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h
index 9eaea2dca5..9e784635c6 100644
--- a/src/core/lib/transport/transport.h
+++ b/src/core/lib/transport/transport.h
@@ -366,9 +366,6 @@ void grpc_transport_destroy(grpc_transport* transport);
/* Get the endpoint used by \a transport */
grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport);
-/* Get the socket uuid used by the transport. Returns 0 if not availible. */
-intptr_t grpc_transport_get_socket_uuid(grpc_transport* transport);
-
/* Allocate a grpc_transport_op, and preconfigure the on_consumed closure to
\a on_consumed and then delete the returned transport op */
grpc_transport_op* grpc_make_transport_op(grpc_closure* on_consumed);
diff --git a/src/core/lib/transport/transport_impl.h b/src/core/lib/transport/transport_impl.h
index d609470ef0..ba5e05df0a 100644
--- a/src/core/lib/transport/transport_impl.h
+++ b/src/core/lib/transport/transport_impl.h
@@ -60,8 +60,6 @@ typedef struct grpc_transport_vtable {
/* implementation of grpc_transport_get_endpoint */
grpc_endpoint* (*get_endpoint)(grpc_transport* self);
-
- intptr_t (*get_socket_uuid)(grpc_transport* self);
} grpc_transport_vtable;
/* an instance of a grpc transport */
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 05:15:39 +0000