diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-01-12 10:16:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-12 10:16:22 +0100 |
commit | c9ec2c0888271491eaf425721a72736392f85945 (patch) | |
tree | 8ee3fe7e6fe56bed7bbfa7c8537add5f24afe12a /include/grpc++/server.h | |
parent | b0b4555f4ca720e626f42855f2257bf598e1bf74 (diff) |
Revert "Stop using std::thread in C++ library since it can trigger exceptions"
Diffstat (limited to 'include/grpc++/server.h')
-rw-r--r-- | include/grpc++/server.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/include/grpc++/server.h b/include/grpc++/server.h index cf590185d1..01c4a60d21 100644 --- a/include/grpc++/server.h +++ b/include/grpc++/server.h @@ -35,7 +35,6 @@ #include <grpc++/support/config.h> #include <grpc++/support/status.h> #include <grpc/compression.h> -#include <grpc/support/thd.h> struct grpc_server; @@ -139,20 +138,10 @@ class Server final : public ServerInterface, private GrpcLibraryCodegen { /// /// \param sync_cq_timeout_msec The timeout to use when calling AsyncNext() on /// server completion queues passed via sync_server_cqs param. - /// - /// \param thread_creator The thread creation function for the sync - /// server. Typically gpr_thd_new - /// - /// \param thread_joiner The thread joining function for the sync - /// server. Typically gpr_thd_join Server(int max_message_size, ChannelArguments* args, std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>> sync_server_cqs, - int min_pollers, int max_pollers, int sync_cq_timeout_msec, - std::function<int(gpr_thd_id*, const char*, void (*)(void*), void*, - const gpr_thd_options*)> - thread_creator, - std::function<void(gpr_thd_id)> thread_joiner); + int min_pollers, int max_pollers, int sync_cq_timeout_msec); /// Register a service. This call does not take ownership of the service. /// The service must exist for the lifetime of the Server instance. @@ -231,14 +220,6 @@ class Server final : public ServerInterface, private GrpcLibraryCodegen { std::unique_ptr<HealthCheckServiceInterface> health_check_service_; bool health_check_service_disabled_; - - std::function<int(gpr_thd_id*, const char*, void (*)(void*), void*, - const gpr_thd_options*)> - thread_creator_; - std::function<void(gpr_thd_id)> thread_joiner_; - - // A special handler for resource exhausted in sync case - std::unique_ptr<internal::MethodHandler> resource_exhausted_handler_; }; } // namespace grpc |