aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc/grpc_posix.h
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2016-09-29 11:16:55 -0700
committerGravatar GitHub <noreply@github.com>2016-09-29 11:16:55 -0700
commitef49a5d2171b77e3ac4ca069b8d2a16c27248f61 (patch)
tree5e732356b1dae72eec72c209189daba45d7eaa4b /include/grpc/grpc_posix.h
parent66306c2ae80fb4298c8dbf8de619719bc2bfe925 (diff)
parent765e6542b943efbcf689ade40fc96d36d87494cf (diff)
Merge pull request #7833 from sreecha/fix_channel_from_fd_api
Remove completion queue parameter from `grpc_server_add_insecure_channel_from_fd` API
Diffstat (limited to 'include/grpc/grpc_posix.h')
-rw-r--r--include/grpc/grpc_posix.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h
index 6d77f0fb82..a8c031548b 100644
--- a/include/grpc/grpc_posix.h
+++ b/include/grpc/grpc_posix.h
@@ -57,11 +57,14 @@ GRPCAPI grpc_channel *grpc_insecure_channel_create_from_fd(
/** Add the connected communication channel based on file descriptor 'fd' to the
'server'. The 'fd' must be an open file descriptor corresponding to a
- connected socket. The 'cq' is a completion queue that will be getting events
- from that descriptor. */
+ connected socket. Events from the file descriptor may come on any of the
+ server completion queues (i.e completion queues registered via the
+ grpc_server_register_completion_queue API).
+
+ The 'reserved' pointer MUST be NULL.
+ */
GRPCAPI void grpc_server_add_insecure_channel_from_fd(grpc_server *server,
- grpc_completion_queue *cq,
- int fd);
+ 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