diff options
author | leonidlazarev <leonidlazarev@yandex-team.com> | 2023-06-02 15:07:38 +0300 |
---|---|---|
committer | leonidlazarev <leonidlazarev@yandex-team.com> | 2023-06-02 15:07:38 +0300 |
commit | 59e0045a61e61c2ac38878f2adc7ec91ca914cc1 (patch) | |
tree | b6b64c51025630a7d40923d4aa7b7b882e1a8848 /contrib/libs/grpc/src/cpp/server/server_builder.cc | |
parent | 7506c5c295065b4360d617393af34203f037946d (diff) | |
download | ydb-59e0045a61e61c2ac38878f2adc7ec91ca914cc1.tar.gz |
feat grpc: update to grpc 1.50.2
update grpc to 1.50.2
update grpcio to 1.50.0
Удаленные патчи:
06-flow_control.patch - логика в upstream удалена
10-fix-crash-on-fork.patch - логика в upstream удалена
12-coverity-fix.patch - логика в upstream удалена
20-P2166-string-nullptr.patch - в upstream временный объект вместо nullptr
PR29209-fix-heap-use-after-free.patch - решение есть в upstream
Добавленные патчи:
pr33085_fix_epoll1_engine_reinit.patch
21-windows_build.patch
Diffstat (limited to 'contrib/libs/grpc/src/cpp/server/server_builder.cc')
-rw-r--r-- | contrib/libs/grpc/src/cpp/server/server_builder.cc | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/contrib/libs/grpc/src/cpp/server/server_builder.cc b/contrib/libs/grpc/src/cpp/server/server_builder.cc index abe95fd8343..9b30a4c7230 100644 --- a/contrib/libs/grpc/src/cpp/server/server_builder.cc +++ b/contrib/libs/grpc/src/cpp/server/server_builder.cc @@ -16,20 +16,42 @@ * */ +#include <limits.h> +#include <stdint.h> +#include <string.h> + +#include <algorithm> +#include <iterator> +#include <memory> +#include <util/generic/string.h> +#include <util/string/cast.h> #include <utility> +#include <vector> -#include <grpc/support/cpu.h> +#include <grpc/grpc.h> +#include <grpc/impl/codegen/compression_types.h> +#include <grpc/impl/codegen/grpc_types.h> #include <grpc/support/log.h> +#include <grpc/support/sync.h> +#include <grpc/support/workaround_list.h> +#include <grpcpp/completion_queue.h> +#include <grpcpp/impl/codegen/server_interface.h> +#include <grpcpp/impl/server_builder_option.h> +#include <grpcpp/impl/server_builder_plugin.h> #include <grpcpp/impl/service_type.h> #include <grpcpp/resource_quota.h> +#include <grpcpp/security/authorization_policy_provider.h> +#include <grpcpp/security/server_credentials.h> #include <grpcpp/server.h> #include <grpcpp/server_builder.h> +#include <grpcpp/server_context.h> +#include <grpcpp/support/channel_arguments.h> +#include <grpcpp/support/config.h> +#include <grpcpp/support/server_interceptor.h> -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/cpp/server/external_connection_acceptor_impl.h" -#include "src/cpp/server/thread_pool_interface.h" namespace grpc { @@ -336,11 +358,18 @@ std::unique_ptr<grpc::Server> ServerBuilder::BuildAndStart() { gpr_log(GPR_INFO, "Callback server."); } + // Merge the application and internal interceptors together. + // Internal interceptors go first. + auto creators = std::move(internal_interceptor_creators_); + creators.insert(creators.end(), + std::make_move_iterator(interceptor_creators_.begin()), + std::make_move_iterator(interceptor_creators_.end())); + std::unique_ptr<grpc::Server> server(new grpc::Server( &args, sync_server_cqs, sync_server_settings_.min_pollers, sync_server_settings_.max_pollers, sync_server_settings_.cq_timeout_msec, std::move(acceptors_), server_config_fetcher_, resource_quota_, - std::move(interceptor_creators_))); + std::move(creators))); ServerInitializer* initializer = server->initializer(); |