diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-30 10:47:24 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-30 10:47:24 -0700 |
| commit | 4944ee23df42e46cf3de64c24c3f8df092841eb2 (patch) | |
| tree | 5fe2148eb7f520a2ffc63a18ad09909704b198a4 /src/cpp | |
| parent | a40d4711104708152c56c1246a41eb9160e18df2 (diff) | |
| parent | be43240564891aaa34bbd911332994fe8d197c0b (diff) | |
Merge remote-tracking branch 'upstream/master' into fail_fast
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/create_channel_posix.cc | 10 | ||||
| -rw-r--r-- | src/cpp/server/server_cc.cc | 2 | ||||
| -rw-r--r-- | src/cpp/server/server_posix.cc | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc index 60cfed3d62..eb323ac50b 100644 --- a/src/cpp/client/create_channel_posix.cc +++ b/src/cpp/client/create_channel_posix.cc @@ -51,6 +51,16 @@ std::shared_ptr<Channel> CreateInsecureChannelFromFd(const grpc::string& target, "", grpc_insecure_channel_create_from_fd(target.c_str(), fd, nullptr)); } +std::shared_ptr<Channel> CreateCustomInsecureChannelFromFd( + const grpc::string& target, int fd, const ChannelArguments& args) { + internal::GrpcLibrary init_lib; + init_lib.init(); + grpc_channel_args channel_args; + args.SetChannelArgs(&channel_args); + return CreateChannelInternal("", grpc_insecure_channel_create_from_fd( + target.c_str(), fd, &channel_args)); +} + #endif // GPR_SUPPORT_CHANNELS_FROM_FD } // namespace grpc diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index a693ce9b8e..3f89275370 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -332,8 +332,6 @@ void Server::SetGlobalCallbacks(GlobalCallbacks* callbacks) { grpc_server* Server::c_server() { return server_; } -CompletionQueue* Server::completion_queue() { return &cq_; } - static grpc_server_register_method_payload_handling PayloadHandlingForMethod( RpcServiceMethod* method) { switch (method->method_type()) { diff --git a/src/cpp/server/server_posix.cc b/src/cpp/server/server_posix.cc index c3aa2adc60..33d42a8dc7 100644 --- a/src/cpp/server/server_posix.cc +++ b/src/cpp/server/server_posix.cc @@ -40,8 +40,7 @@ namespace grpc { #ifdef GPR_SUPPORT_CHANNELS_FROM_FD void AddInsecureChannelFromFd(Server* server, int fd) { - grpc_server_add_insecure_channel_from_fd( - server->c_server(), server->completion_queue()->cq(), fd); + grpc_server_add_insecure_channel_from_fd(server->c_server(), NULL, fd); } #endif // GPR_SUPPORT_CHANNELS_FROM_FD |