diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-10-18 09:38:26 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-10-18 09:38:26 -0700 |
| commit | 62693ec1bd0fe0133a3d382ef2e11ffa935e9904 (patch) | |
| tree | f84b6c168f55ef2f4b8661ab64960fb11b0f7d76 /include/grpc | |
| parent | be4ab30899f6ae91e07f02c33297ca462f778296 (diff) | |
| parent | d2704ecca0b6cc43e8dfde6dd64875b4fb71d6cd (diff) | |
Merge remote-tracking branch 'upstream/master' into config-isolation
Diffstat (limited to 'include/grpc')
| -rw-r--r-- | include/grpc/grpc.h | 4 | ||||
| -rw-r--r-- | include/grpc/grpc_posix.h | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index a9beee1c9e..02ab6e8ba4 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -503,6 +503,10 @@ GRPCAPI char* grpc_channelz_get_top_channels(intptr_t start_channel_id); /* Gets all servers that exist in the process. */ GRPCAPI char* grpc_channelz_get_servers(intptr_t start_server_id); +/* Gets all server sockets that exist in the server. */ +GRPCAPI char* grpc_channelz_get_server_sockets(intptr_t server_id, + intptr_t start_socket_id); + /* Returns a single Channel, or else a NOT_FOUND code. The returned string is allocated and must be freed by the application. */ GRPCAPI char* grpc_channelz_get_channel(intptr_t channel_id); diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h index 5f1ada5aaf..fbce5e13c1 100644 --- a/include/grpc/grpc_posix.h +++ b/include/grpc/grpc_posix.h @@ -52,14 +52,6 @@ GRPCAPI grpc_channel* grpc_insecure_channel_create_from_fd( GRPCAPI void grpc_server_add_insecure_channel_from_fd(grpc_server* server, void* reserved, int fd); -/** GRPC Core POSIX library may internally use signals to optimize some work. - The library uses (SIGRTMIN + 6) signal by default. Use this API to instruct - the library to use a different signal i.e 'signum' instead. - Note: - - To prevent GRPC library from using any signals, pass a 'signum' of -1 - - This API is optional but if called, it MUST be called before grpc_init() */ -GRPCAPI void grpc_use_signal(int signum); - #ifdef __cplusplus } #endif |