Hello world!

diff --git a/.grpc.metadata b/.grpc.metadata index 8f98e87..6a45004 100644 --- a/.grpc.metadata +++ b/.grpc.metadata @@ -1,6 +1,6 @@ +880c2177d6021bd6c4c0a9d01a32e974f6b43925 SOURCES/grpc-1.48.4.tar.gz +a01364a9c6e7aa314b6cffdf22377a7bde85ba11 SOURCES/googletest-0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz 8c793d42dea7e87a1c7736406d63d0ce0f2e9a00 SOURCES/data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz 91c505c822dfb16318290afacb90478b8a6200a4 SOURCES/googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz -a01364a9c6e7aa314b6cffdf22377a7bde85ba11 SOURCES/googletest-0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz -880c2177d6021bd6c4c0a9d01a32e974f6b43925 SOURCES/grpc-1.48.4.tar.gz 4542627be900520721af59b93e211683dbb0e4bc SOURCES/opencensus-proto-0.3.0.tar.gz a152c3abb31dd14e5b0dbfe25ff5a3fbb856cb3b SOURCES/xds-cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz diff --git a/SOURCES/27516.patch b/SOURCES/27516.patch new file mode 100644 index 0000000..e87f132 --- /dev/null +++ b/SOURCES/27516.patch @@ -0,0 +1,26 @@ +From 1ff40f3a3ceb596fee7d1bb45e6985ace04352e9 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Wed, 29 Sep 2021 13:33:22 -0400 +Subject: [PATCH] In src/core/lib/promise/detail/basic_seq.h, include cassert +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It is needed for assert(…). +--- + src/core/lib/promise/detail/basic_seq.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/core/lib/promise/detail/basic_seq.h b/src/core/lib/promise/detail/basic_seq.h +index e03bb6d475ba..016102d28f73 100644 +--- a/src/core/lib/promise/detail/basic_seq.h ++++ b/src/core/lib/promise/detail/basic_seq.h +@@ -17,6 +17,8 @@ + + #include + ++#include ++ + #include "absl/types/variant.h" + #include "absl/utility/utility.h" + diff --git a/SOURCES/72351f63fd650cc7acfcd2d0307e8e8e8f777283.patch b/SOURCES/72351f63fd650cc7acfcd2d0307e8e8e8f777283.patch new file mode 100644 index 0000000..d6b6489 --- /dev/null +++ b/SOURCES/72351f63fd650cc7acfcd2d0307e8e8e8f777283.patch @@ -0,0 +1,2070 @@ +From 72351f63fd650cc7acfcd2d0307e8e8e8f777283 Mon Sep 17 00:00:00 2001 +From: Esun Kim +Date: Tue, 14 Jan 2020 16:35:23 -0800 +Subject: [PATCH] Remove grpc sources from grpc++ + +--- + BUILD.gn | 240 ----------------- + CMakeLists.txt | 396 ---------------------------- + Makefile | 396 ---------------------------- + build.yaml | 1 - + grpc.gyp | 396 ---------------------------- + tools/doxygen/Doxyfile.c++.internal | 240 ----------------- + 6 files changed, 1669 deletions(-) + +diff --git a/BUILD.gn b/BUILD.gn +index 0599ae15048..8a4d6c7b23c 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -1191,135 +1191,32 @@ config("grpc_config") { + "include/grpcpp/support/sync_stream_impl.h", + "include/grpcpp/support/time.h", + "include/grpcpp/support/validate_service_config.h", +- "src/core/ext/filters/client_channel/backend_metric.cc", +- "src/core/ext/filters/client_channel/backend_metric.h", +- "src/core/ext/filters/client_channel/backup_poller.cc", +- "src/core/ext/filters/client_channel/backup_poller.h", +- "src/core/ext/filters/client_channel/channel_connectivity.cc", +- "src/core/ext/filters/client_channel/client_channel.cc", +- "src/core/ext/filters/client_channel/client_channel.h", +- "src/core/ext/filters/client_channel/client_channel_channelz.cc", +- "src/core/ext/filters/client_channel/client_channel_channelz.h", +- "src/core/ext/filters/client_channel/client_channel_factory.cc", +- "src/core/ext/filters/client_channel/client_channel_factory.h", +- "src/core/ext/filters/client_channel/client_channel_plugin.cc", +- "src/core/ext/filters/client_channel/connector.h", +- "src/core/ext/filters/client_channel/global_subchannel_pool.cc", +- "src/core/ext/filters/client_channel/global_subchannel_pool.h", +- "src/core/ext/filters/client_channel/health/health_check_client.cc", +- "src/core/ext/filters/client_channel/health/health_check_client.h", +- "src/core/ext/filters/client_channel/http_connect_handshaker.cc", +- "src/core/ext/filters/client_channel/http_connect_handshaker.h", +- "src/core/ext/filters/client_channel/http_proxy.cc", +- "src/core/ext/filters/client_channel/http_proxy.h", +- "src/core/ext/filters/client_channel/lb_policy.cc", +- "src/core/ext/filters/client_channel/lb_policy.h", +- "src/core/ext/filters/client_channel/lb_policy_factory.h", +- "src/core/ext/filters/client_channel/lb_policy_registry.cc", +- "src/core/ext/filters/client_channel/lb_policy_registry.h", +- "src/core/ext/filters/client_channel/local_subchannel_pool.cc", +- "src/core/ext/filters/client_channel/local_subchannel_pool.h", +- "src/core/ext/filters/client_channel/parse_address.cc", +- "src/core/ext/filters/client_channel/parse_address.h", +- "src/core/ext/filters/client_channel/proxy_mapper.h", +- "src/core/ext/filters/client_channel/proxy_mapper_registry.cc", +- "src/core/ext/filters/client_channel/proxy_mapper_registry.h", +- "src/core/ext/filters/client_channel/resolver.cc", +- "src/core/ext/filters/client_channel/resolver.h", +- "src/core/ext/filters/client_channel/resolver_factory.h", +- "src/core/ext/filters/client_channel/resolver_registry.cc", +- "src/core/ext/filters/client_channel/resolver_registry.h", +- "src/core/ext/filters/client_channel/resolver_result_parsing.cc", +- "src/core/ext/filters/client_channel/resolver_result_parsing.h", +- "src/core/ext/filters/client_channel/resolving_lb_policy.cc", +- "src/core/ext/filters/client_channel/resolving_lb_policy.h", +- "src/core/ext/filters/client_channel/retry_throttle.cc", +- "src/core/ext/filters/client_channel/retry_throttle.h", +- "src/core/ext/filters/client_channel/server_address.cc", +- "src/core/ext/filters/client_channel/server_address.h", +- "src/core/ext/filters/client_channel/service_config.cc", +- "src/core/ext/filters/client_channel/service_config.h", +- "src/core/ext/filters/client_channel/subchannel.cc", +- "src/core/ext/filters/client_channel/subchannel.h", +- "src/core/ext/filters/client_channel/subchannel_interface.h", +- "src/core/ext/filters/client_channel/subchannel_pool_interface.cc", +- "src/core/ext/filters/client_channel/subchannel_pool_interface.h", +- "src/core/ext/filters/deadline/deadline_filter.cc", +- "src/core/ext/filters/deadline/deadline_filter.h", + "src/core/ext/transport/inproc/inproc_transport.h", +- "src/core/ext/upb-generated/gogoproto/gogo.upb.c", +- "src/core/ext/upb-generated/gogoproto/gogo.upb.h", +- "src/core/ext/upb-generated/google/api/annotations.upb.c", +- "src/core/ext/upb-generated/google/api/annotations.upb.h", +- "src/core/ext/upb-generated/google/api/http.upb.c", +- "src/core/ext/upb-generated/google/api/http.upb.h", +- "src/core/ext/upb-generated/google/protobuf/any.upb.c", +- "src/core/ext/upb-generated/google/protobuf/any.upb.h", +- "src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", +- "src/core/ext/upb-generated/google/protobuf/descriptor.upb.h", +- "src/core/ext/upb-generated/google/protobuf/duration.upb.c", +- "src/core/ext/upb-generated/google/protobuf/duration.upb.h", +- "src/core/ext/upb-generated/google/protobuf/empty.upb.c", +- "src/core/ext/upb-generated/google/protobuf/empty.upb.h", +- "src/core/ext/upb-generated/google/protobuf/struct.upb.c", +- "src/core/ext/upb-generated/google/protobuf/struct.upb.h", +- "src/core/ext/upb-generated/google/protobuf/timestamp.upb.c", +- "src/core/ext/upb-generated/google/protobuf/timestamp.upb.h", +- "src/core/ext/upb-generated/google/protobuf/wrappers.upb.c", +- "src/core/ext/upb-generated/google/protobuf/wrappers.upb.h", +- "src/core/ext/upb-generated/google/rpc/status.upb.c", +- "src/core/ext/upb-generated/google/rpc/status.upb.h", + "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c", + "src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h", +- "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c", +- "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h", +- "src/core/ext/upb-generated/validate/validate.upb.c", +- "src/core/ext/upb-generated/validate/validate.upb.h", +- "src/core/lib/avl/avl.cc", + "src/core/lib/avl/avl.h", +- "src/core/lib/backoff/backoff.cc", + "src/core/lib/backoff/backoff.h", +- "src/core/lib/channel/channel_args.cc", + "src/core/lib/channel/channel_args.h", +- "src/core/lib/channel/channel_stack.cc", + "src/core/lib/channel/channel_stack.h", +- "src/core/lib/channel/channel_stack_builder.cc", + "src/core/lib/channel/channel_stack_builder.h", +- "src/core/lib/channel/channel_trace.cc", + "src/core/lib/channel/channel_trace.h", +- "src/core/lib/channel/channelz.cc", + "src/core/lib/channel/channelz.h", +- "src/core/lib/channel/channelz_registry.cc", + "src/core/lib/channel/channelz_registry.h", +- "src/core/lib/channel/connected_channel.cc", + "src/core/lib/channel/connected_channel.h", + "src/core/lib/channel/context.h", +- "src/core/lib/channel/handshaker.cc", + "src/core/lib/channel/handshaker.h", + "src/core/lib/channel/handshaker_factory.h", +- "src/core/lib/channel/handshaker_registry.cc", + "src/core/lib/channel/handshaker_registry.h", +- "src/core/lib/channel/status_util.cc", + "src/core/lib/channel/status_util.h", + "src/core/lib/compression/algorithm_metadata.h", +- "src/core/lib/compression/compression.cc", +- "src/core/lib/compression/compression_args.cc", + "src/core/lib/compression/compression_args.h", +- "src/core/lib/compression/compression_internal.cc", + "src/core/lib/compression/compression_internal.h", +- "src/core/lib/compression/message_compress.cc", + "src/core/lib/compression/message_compress.h", +- "src/core/lib/compression/stream_compression.cc", + "src/core/lib/compression/stream_compression.h", +- "src/core/lib/compression/stream_compression_gzip.cc", + "src/core/lib/compression/stream_compression_gzip.h", +- "src/core/lib/compression/stream_compression_identity.cc", + "src/core/lib/compression/stream_compression_identity.h", +- "src/core/lib/debug/stats.cc", + "src/core/lib/debug/stats.h", +- "src/core/lib/debug/stats_data.cc", + "src/core/lib/debug/stats_data.h", +- "src/core/lib/debug/trace.cc", + "src/core/lib/debug/trace.h", + "src/core/lib/gpr/alloc.h", + "src/core/lib/gpr/arena.h", +@@ -1356,257 +1253,120 @@ config("grpc_config") { + "src/core/lib/gprpp/string_view.h", + "src/core/lib/gprpp/sync.h", + "src/core/lib/gprpp/thd.h", +- "src/core/lib/http/format_request.cc", + "src/core/lib/http/format_request.h", +- "src/core/lib/http/httpcli.cc", + "src/core/lib/http/httpcli.h", +- "src/core/lib/http/parser.cc", + "src/core/lib/http/parser.h", + "src/core/lib/iomgr/block_annotate.h", +- "src/core/lib/iomgr/buffer_list.cc", + "src/core/lib/iomgr/buffer_list.h", +- "src/core/lib/iomgr/call_combiner.cc", + "src/core/lib/iomgr/call_combiner.h", +- "src/core/lib/iomgr/cfstream_handle.cc", + "src/core/lib/iomgr/cfstream_handle.h", + "src/core/lib/iomgr/closure.h", +- "src/core/lib/iomgr/combiner.cc", + "src/core/lib/iomgr/combiner.h", + "src/core/lib/iomgr/dynamic_annotations.h", +- "src/core/lib/iomgr/endpoint.cc", + "src/core/lib/iomgr/endpoint.h", +- "src/core/lib/iomgr/endpoint_cfstream.cc", + "src/core/lib/iomgr/endpoint_cfstream.h", + "src/core/lib/iomgr/endpoint_pair.h", +- "src/core/lib/iomgr/endpoint_pair_posix.cc", +- "src/core/lib/iomgr/endpoint_pair_uv.cc", +- "src/core/lib/iomgr/endpoint_pair_windows.cc", +- "src/core/lib/iomgr/error.cc", + "src/core/lib/iomgr/error.h", +- "src/core/lib/iomgr/error_cfstream.cc", + "src/core/lib/iomgr/error_cfstream.h", + "src/core/lib/iomgr/error_internal.h", +- "src/core/lib/iomgr/ev_epoll1_linux.cc", + "src/core/lib/iomgr/ev_epoll1_linux.h", +- "src/core/lib/iomgr/ev_epollex_linux.cc", + "src/core/lib/iomgr/ev_epollex_linux.h", +- "src/core/lib/iomgr/ev_poll_posix.cc", + "src/core/lib/iomgr/ev_poll_posix.h", +- "src/core/lib/iomgr/ev_posix.cc", + "src/core/lib/iomgr/ev_posix.h", +- "src/core/lib/iomgr/ev_windows.cc", +- "src/core/lib/iomgr/exec_ctx.cc", + "src/core/lib/iomgr/exec_ctx.h", +- "src/core/lib/iomgr/executor.cc", + "src/core/lib/iomgr/executor.h", +- "src/core/lib/iomgr/executor/mpmcqueue.cc", + "src/core/lib/iomgr/executor/mpmcqueue.h", +- "src/core/lib/iomgr/executor/threadpool.cc", + "src/core/lib/iomgr/executor/threadpool.h", +- "src/core/lib/iomgr/fork_posix.cc", +- "src/core/lib/iomgr/fork_windows.cc", + "src/core/lib/iomgr/gethostname.h", +- "src/core/lib/iomgr/gethostname_fallback.cc", +- "src/core/lib/iomgr/gethostname_host_name_max.cc", +- "src/core/lib/iomgr/gethostname_sysconf.cc", + "src/core/lib/iomgr/grpc_if_nametoindex.h", +- "src/core/lib/iomgr/grpc_if_nametoindex_posix.cc", +- "src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc", +- "src/core/lib/iomgr/internal_errqueue.cc", + "src/core/lib/iomgr/internal_errqueue.h", +- "src/core/lib/iomgr/iocp_windows.cc", + "src/core/lib/iomgr/iocp_windows.h", +- "src/core/lib/iomgr/iomgr.cc", + "src/core/lib/iomgr/iomgr.h", +- "src/core/lib/iomgr/iomgr_custom.cc", + "src/core/lib/iomgr/iomgr_custom.h", +- "src/core/lib/iomgr/iomgr_internal.cc", + "src/core/lib/iomgr/iomgr_internal.h", +- "src/core/lib/iomgr/iomgr_posix.cc", + "src/core/lib/iomgr/iomgr_posix.h", +- "src/core/lib/iomgr/iomgr_posix_cfstream.cc", +- "src/core/lib/iomgr/iomgr_uv.cc", +- "src/core/lib/iomgr/iomgr_windows.cc", +- "src/core/lib/iomgr/is_epollexclusive_available.cc", + "src/core/lib/iomgr/is_epollexclusive_available.h", +- "src/core/lib/iomgr/load_file.cc", + "src/core/lib/iomgr/load_file.h", +- "src/core/lib/iomgr/lockfree_event.cc", + "src/core/lib/iomgr/lockfree_event.h", +- "src/core/lib/iomgr/logical_thread.cc", + "src/core/lib/iomgr/logical_thread.h", + "src/core/lib/iomgr/nameser.h", +- "src/core/lib/iomgr/polling_entity.cc", + "src/core/lib/iomgr/polling_entity.h", +- "src/core/lib/iomgr/pollset.cc", + "src/core/lib/iomgr/pollset.h", +- "src/core/lib/iomgr/pollset_custom.cc", + "src/core/lib/iomgr/pollset_custom.h", +- "src/core/lib/iomgr/pollset_set.cc", + "src/core/lib/iomgr/pollset_set.h", +- "src/core/lib/iomgr/pollset_set_custom.cc", + "src/core/lib/iomgr/pollset_set_custom.h", +- "src/core/lib/iomgr/pollset_set_windows.cc", + "src/core/lib/iomgr/pollset_set_windows.h", +- "src/core/lib/iomgr/pollset_uv.cc", +- "src/core/lib/iomgr/pollset_windows.cc", + "src/core/lib/iomgr/pollset_windows.h", + "src/core/lib/iomgr/port.h", +- "src/core/lib/iomgr/resolve_address.cc", + "src/core/lib/iomgr/resolve_address.h", +- "src/core/lib/iomgr/resolve_address_custom.cc", + "src/core/lib/iomgr/resolve_address_custom.h", +- "src/core/lib/iomgr/resolve_address_posix.cc", +- "src/core/lib/iomgr/resolve_address_windows.cc", +- "src/core/lib/iomgr/resource_quota.cc", + "src/core/lib/iomgr/resource_quota.h", + "src/core/lib/iomgr/sockaddr.h", + "src/core/lib/iomgr/sockaddr_custom.h", + "src/core/lib/iomgr/sockaddr_posix.h", +- "src/core/lib/iomgr/sockaddr_utils.cc", + "src/core/lib/iomgr/sockaddr_utils.h", + "src/core/lib/iomgr/sockaddr_windows.h", +- "src/core/lib/iomgr/socket_factory_posix.cc", + "src/core/lib/iomgr/socket_factory_posix.h", +- "src/core/lib/iomgr/socket_mutator.cc", + "src/core/lib/iomgr/socket_mutator.h", + "src/core/lib/iomgr/socket_utils.h", +- "src/core/lib/iomgr/socket_utils_common_posix.cc", +- "src/core/lib/iomgr/socket_utils_linux.cc", +- "src/core/lib/iomgr/socket_utils_posix.cc", + "src/core/lib/iomgr/socket_utils_posix.h", +- "src/core/lib/iomgr/socket_utils_uv.cc", +- "src/core/lib/iomgr/socket_utils_windows.cc", +- "src/core/lib/iomgr/socket_windows.cc", + "src/core/lib/iomgr/socket_windows.h", + "src/core/lib/iomgr/sys_epoll_wrapper.h", +- "src/core/lib/iomgr/tcp_client.cc", + "src/core/lib/iomgr/tcp_client.h", +- "src/core/lib/iomgr/tcp_client_cfstream.cc", +- "src/core/lib/iomgr/tcp_client_custom.cc", +- "src/core/lib/iomgr/tcp_client_posix.cc", + "src/core/lib/iomgr/tcp_client_posix.h", +- "src/core/lib/iomgr/tcp_client_windows.cc", +- "src/core/lib/iomgr/tcp_custom.cc", + "src/core/lib/iomgr/tcp_custom.h", +- "src/core/lib/iomgr/tcp_posix.cc", + "src/core/lib/iomgr/tcp_posix.h", +- "src/core/lib/iomgr/tcp_server.cc", + "src/core/lib/iomgr/tcp_server.h", +- "src/core/lib/iomgr/tcp_server_custom.cc", +- "src/core/lib/iomgr/tcp_server_posix.cc", + "src/core/lib/iomgr/tcp_server_utils_posix.h", +- "src/core/lib/iomgr/tcp_server_utils_posix_common.cc", +- "src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc", +- "src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc", +- "src/core/lib/iomgr/tcp_server_windows.cc", +- "src/core/lib/iomgr/tcp_uv.cc", +- "src/core/lib/iomgr/tcp_windows.cc", + "src/core/lib/iomgr/tcp_windows.h", +- "src/core/lib/iomgr/time_averaged_stats.cc", + "src/core/lib/iomgr/time_averaged_stats.h", +- "src/core/lib/iomgr/timer.cc", + "src/core/lib/iomgr/timer.h", +- "src/core/lib/iomgr/timer_custom.cc", + "src/core/lib/iomgr/timer_custom.h", +- "src/core/lib/iomgr/timer_generic.cc", +- "src/core/lib/iomgr/timer_heap.cc", + "src/core/lib/iomgr/timer_heap.h", +- "src/core/lib/iomgr/timer_manager.cc", + "src/core/lib/iomgr/timer_manager.h", +- "src/core/lib/iomgr/timer_uv.cc", +- "src/core/lib/iomgr/udp_server.cc", + "src/core/lib/iomgr/udp_server.h", +- "src/core/lib/iomgr/unix_sockets_posix.cc", + "src/core/lib/iomgr/unix_sockets_posix.h", +- "src/core/lib/iomgr/unix_sockets_posix_noop.cc", +- "src/core/lib/iomgr/wakeup_fd_eventfd.cc", +- "src/core/lib/iomgr/wakeup_fd_nospecial.cc", +- "src/core/lib/iomgr/wakeup_fd_pipe.cc", + "src/core/lib/iomgr/wakeup_fd_pipe.h", +- "src/core/lib/iomgr/wakeup_fd_posix.cc", + "src/core/lib/iomgr/wakeup_fd_posix.h", +- "src/core/lib/json/json.cc", + "src/core/lib/json/json.h", + "src/core/lib/json/json_common.h", +- "src/core/lib/json/json_reader.cc", + "src/core/lib/json/json_reader.h", +- "src/core/lib/json/json_string.cc", +- "src/core/lib/json/json_writer.cc", + "src/core/lib/json/json_writer.h", + "src/core/lib/profiling/timers.h", +- "src/core/lib/slice/b64.cc", + "src/core/lib/slice/b64.h", +- "src/core/lib/slice/percent_encoding.cc", + "src/core/lib/slice/percent_encoding.h", +- "src/core/lib/slice/slice.cc", +- "src/core/lib/slice/slice_buffer.cc", + "src/core/lib/slice/slice_hash_table.h", +- "src/core/lib/slice/slice_intern.cc", + "src/core/lib/slice/slice_internal.h", +- "src/core/lib/slice/slice_string_helpers.cc", + "src/core/lib/slice/slice_string_helpers.h", + "src/core/lib/slice/slice_utils.h", + "src/core/lib/slice/slice_weak_hash_table.h", +- "src/core/lib/surface/api_trace.cc", + "src/core/lib/surface/api_trace.h", +- "src/core/lib/surface/byte_buffer.cc", +- "src/core/lib/surface/byte_buffer_reader.cc", +- "src/core/lib/surface/call.cc", + "src/core/lib/surface/call.h", +- "src/core/lib/surface/call_details.cc", +- "src/core/lib/surface/call_log_batch.cc", + "src/core/lib/surface/call_test_only.h", +- "src/core/lib/surface/channel.cc", + "src/core/lib/surface/channel.h", +- "src/core/lib/surface/channel_init.cc", + "src/core/lib/surface/channel_init.h", +- "src/core/lib/surface/channel_ping.cc", +- "src/core/lib/surface/channel_stack_type.cc", + "src/core/lib/surface/channel_stack_type.h", +- "src/core/lib/surface/completion_queue.cc", + "src/core/lib/surface/completion_queue.h", +- "src/core/lib/surface/completion_queue_factory.cc", + "src/core/lib/surface/completion_queue_factory.h", +- "src/core/lib/surface/event_string.cc", + "src/core/lib/surface/event_string.h", + "src/core/lib/surface/init.h", +- "src/core/lib/surface/lame_client.cc", + "src/core/lib/surface/lame_client.h", +- "src/core/lib/surface/metadata_array.cc", +- "src/core/lib/surface/server.cc", + "src/core/lib/surface/server.h", +- "src/core/lib/surface/validate_metadata.cc", + "src/core/lib/surface/validate_metadata.h", +- "src/core/lib/surface/version.cc", +- "src/core/lib/transport/bdp_estimator.cc", + "src/core/lib/transport/bdp_estimator.h", +- "src/core/lib/transport/byte_stream.cc", + "src/core/lib/transport/byte_stream.h", +- "src/core/lib/transport/connectivity_state.cc", + "src/core/lib/transport/connectivity_state.h", +- "src/core/lib/transport/error_utils.cc", + "src/core/lib/transport/error_utils.h", + "src/core/lib/transport/http2_errors.h", +- "src/core/lib/transport/metadata.cc", + "src/core/lib/transport/metadata.h", +- "src/core/lib/transport/metadata_batch.cc", + "src/core/lib/transport/metadata_batch.h", +- "src/core/lib/transport/pid_controller.cc", + "src/core/lib/transport/pid_controller.h", +- "src/core/lib/transport/static_metadata.cc", + "src/core/lib/transport/static_metadata.h", +- "src/core/lib/transport/status_conversion.cc", + "src/core/lib/transport/status_conversion.h", +- "src/core/lib/transport/status_metadata.cc", + "src/core/lib/transport/status_metadata.h", +- "src/core/lib/transport/timeout_encoding.cc", + "src/core/lib/transport/timeout_encoding.h", +- "src/core/lib/transport/transport.cc", + "src/core/lib/transport/transport.h", + "src/core/lib/transport/transport_impl.h", +- "src/core/lib/transport/transport_op_string.cc", +- "src/core/lib/uri/uri_parser.cc", + "src/core/lib/uri/uri_parser.h", + "src/cpp/client/channel_cc.cc", + "src/cpp/client/client_context.cc", +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d4418ad619..be27010428f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3299,205 +3299,7 @@ add_library(grpc++ + src/cpp/util/status.cc + src/cpp/util/string_ref.cc + src/cpp/util/time_cc.cc +- src/core/ext/filters/client_channel/backend_metric.cc +- src/core/ext/filters/client_channel/backup_poller.cc +- src/core/ext/filters/client_channel/channel_connectivity.cc +- src/core/ext/filters/client_channel/client_channel.cc +- src/core/ext/filters/client_channel/client_channel_channelz.cc +- src/core/ext/filters/client_channel/client_channel_factory.cc +- src/core/ext/filters/client_channel/client_channel_plugin.cc +- src/core/ext/filters/client_channel/global_subchannel_pool.cc +- src/core/ext/filters/client_channel/health/health_check_client.cc +- src/core/ext/filters/client_channel/http_connect_handshaker.cc +- src/core/ext/filters/client_channel/http_proxy.cc +- src/core/ext/filters/client_channel/lb_policy.cc +- src/core/ext/filters/client_channel/lb_policy_registry.cc +- src/core/ext/filters/client_channel/local_subchannel_pool.cc +- src/core/ext/filters/client_channel/parse_address.cc +- src/core/ext/filters/client_channel/proxy_mapper_registry.cc +- src/core/ext/filters/client_channel/resolver.cc +- src/core/ext/filters/client_channel/resolver_registry.cc +- src/core/ext/filters/client_channel/resolver_result_parsing.cc +- src/core/ext/filters/client_channel/resolving_lb_policy.cc +- src/core/ext/filters/client_channel/retry_throttle.cc +- src/core/ext/filters/client_channel/server_address.cc +- src/core/ext/filters/client_channel/service_config.cc +- src/core/ext/filters/client_channel/subchannel.cc +- src/core/ext/filters/client_channel/subchannel_pool_interface.cc +- src/core/lib/avl/avl.cc +- src/core/lib/backoff/backoff.cc +- src/core/lib/channel/channel_args.cc +- src/core/lib/channel/channel_stack.cc +- src/core/lib/channel/channel_stack_builder.cc +- src/core/lib/channel/channel_trace.cc +- src/core/lib/channel/channelz.cc +- src/core/lib/channel/channelz_registry.cc +- src/core/lib/channel/connected_channel.cc +- src/core/lib/channel/handshaker.cc +- src/core/lib/channel/handshaker_registry.cc +- src/core/lib/channel/status_util.cc +- src/core/lib/compression/compression.cc +- src/core/lib/compression/compression_args.cc +- src/core/lib/compression/compression_internal.cc +- src/core/lib/compression/message_compress.cc +- src/core/lib/compression/stream_compression.cc +- src/core/lib/compression/stream_compression_gzip.cc +- src/core/lib/compression/stream_compression_identity.cc +- src/core/lib/debug/stats.cc +- src/core/lib/debug/stats_data.cc +- src/core/lib/http/format_request.cc +- src/core/lib/http/httpcli.cc +- src/core/lib/http/parser.cc +- src/core/lib/iomgr/buffer_list.cc +- src/core/lib/iomgr/call_combiner.cc +- src/core/lib/iomgr/cfstream_handle.cc +- src/core/lib/iomgr/combiner.cc +- src/core/lib/iomgr/endpoint.cc +- src/core/lib/iomgr/endpoint_cfstream.cc +- src/core/lib/iomgr/endpoint_pair_posix.cc +- src/core/lib/iomgr/endpoint_pair_uv.cc +- src/core/lib/iomgr/endpoint_pair_windows.cc +- src/core/lib/iomgr/error.cc +- src/core/lib/iomgr/error_cfstream.cc +- src/core/lib/iomgr/ev_epoll1_linux.cc +- src/core/lib/iomgr/ev_epollex_linux.cc +- src/core/lib/iomgr/ev_poll_posix.cc +- src/core/lib/iomgr/ev_posix.cc +- src/core/lib/iomgr/ev_windows.cc +- src/core/lib/iomgr/exec_ctx.cc +- src/core/lib/iomgr/executor.cc +- src/core/lib/iomgr/executor/mpmcqueue.cc +- src/core/lib/iomgr/executor/threadpool.cc +- src/core/lib/iomgr/fork_posix.cc +- src/core/lib/iomgr/fork_windows.cc +- src/core/lib/iomgr/gethostname_fallback.cc +- src/core/lib/iomgr/gethostname_host_name_max.cc +- src/core/lib/iomgr/gethostname_sysconf.cc +- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc +- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc +- src/core/lib/iomgr/internal_errqueue.cc +- src/core/lib/iomgr/iocp_windows.cc +- src/core/lib/iomgr/iomgr.cc +- src/core/lib/iomgr/iomgr_custom.cc +- src/core/lib/iomgr/iomgr_internal.cc +- src/core/lib/iomgr/iomgr_posix.cc +- src/core/lib/iomgr/iomgr_posix_cfstream.cc +- src/core/lib/iomgr/iomgr_uv.cc +- src/core/lib/iomgr/iomgr_windows.cc +- src/core/lib/iomgr/is_epollexclusive_available.cc +- src/core/lib/iomgr/load_file.cc +- src/core/lib/iomgr/lockfree_event.cc +- src/core/lib/iomgr/logical_thread.cc +- src/core/lib/iomgr/polling_entity.cc +- src/core/lib/iomgr/pollset.cc +- src/core/lib/iomgr/pollset_custom.cc +- src/core/lib/iomgr/pollset_set.cc +- src/core/lib/iomgr/pollset_set_custom.cc +- src/core/lib/iomgr/pollset_set_windows.cc +- src/core/lib/iomgr/pollset_uv.cc +- src/core/lib/iomgr/pollset_windows.cc +- src/core/lib/iomgr/resolve_address.cc +- src/core/lib/iomgr/resolve_address_custom.cc +- src/core/lib/iomgr/resolve_address_posix.cc +- src/core/lib/iomgr/resolve_address_windows.cc +- src/core/lib/iomgr/resource_quota.cc +- src/core/lib/iomgr/sockaddr_utils.cc +- src/core/lib/iomgr/socket_factory_posix.cc +- src/core/lib/iomgr/socket_mutator.cc +- src/core/lib/iomgr/socket_utils_common_posix.cc +- src/core/lib/iomgr/socket_utils_linux.cc +- src/core/lib/iomgr/socket_utils_posix.cc +- src/core/lib/iomgr/socket_utils_uv.cc +- src/core/lib/iomgr/socket_utils_windows.cc +- src/core/lib/iomgr/socket_windows.cc +- src/core/lib/iomgr/tcp_client.cc +- src/core/lib/iomgr/tcp_client_cfstream.cc +- src/core/lib/iomgr/tcp_client_custom.cc +- src/core/lib/iomgr/tcp_client_posix.cc +- src/core/lib/iomgr/tcp_client_windows.cc +- src/core/lib/iomgr/tcp_custom.cc +- src/core/lib/iomgr/tcp_posix.cc +- src/core/lib/iomgr/tcp_server.cc +- src/core/lib/iomgr/tcp_server_custom.cc +- src/core/lib/iomgr/tcp_server_posix.cc +- src/core/lib/iomgr/tcp_server_utils_posix_common.cc +- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc +- src/core/lib/iomgr/tcp_server_windows.cc +- src/core/lib/iomgr/tcp_uv.cc +- src/core/lib/iomgr/tcp_windows.cc +- src/core/lib/iomgr/time_averaged_stats.cc +- src/core/lib/iomgr/timer.cc +- src/core/lib/iomgr/timer_custom.cc +- src/core/lib/iomgr/timer_generic.cc +- src/core/lib/iomgr/timer_heap.cc +- src/core/lib/iomgr/timer_manager.cc +- src/core/lib/iomgr/timer_uv.cc +- src/core/lib/iomgr/udp_server.cc +- src/core/lib/iomgr/unix_sockets_posix.cc +- src/core/lib/iomgr/unix_sockets_posix_noop.cc +- src/core/lib/iomgr/wakeup_fd_eventfd.cc +- src/core/lib/iomgr/wakeup_fd_nospecial.cc +- src/core/lib/iomgr/wakeup_fd_pipe.cc +- src/core/lib/iomgr/wakeup_fd_posix.cc +- src/core/lib/json/json.cc +- src/core/lib/json/json_reader.cc +- src/core/lib/json/json_string.cc +- src/core/lib/json/json_writer.cc +- src/core/lib/slice/b64.cc +- src/core/lib/slice/percent_encoding.cc +- src/core/lib/slice/slice.cc +- src/core/lib/slice/slice_buffer.cc +- src/core/lib/slice/slice_intern.cc +- src/core/lib/slice/slice_string_helpers.cc +- src/core/lib/surface/api_trace.cc +- src/core/lib/surface/byte_buffer.cc +- src/core/lib/surface/byte_buffer_reader.cc +- src/core/lib/surface/call.cc +- src/core/lib/surface/call_details.cc +- src/core/lib/surface/call_log_batch.cc +- src/core/lib/surface/channel.cc +- src/core/lib/surface/channel_init.cc +- src/core/lib/surface/channel_ping.cc +- src/core/lib/surface/channel_stack_type.cc +- src/core/lib/surface/completion_queue.cc +- src/core/lib/surface/completion_queue_factory.cc +- src/core/lib/surface/event_string.cc +- src/core/lib/surface/lame_client.cc +- src/core/lib/surface/metadata_array.cc +- src/core/lib/surface/server.cc +- src/core/lib/surface/validate_metadata.cc +- src/core/lib/surface/version.cc +- src/core/lib/transport/bdp_estimator.cc +- src/core/lib/transport/byte_stream.cc +- src/core/lib/transport/connectivity_state.cc +- src/core/lib/transport/error_utils.cc +- src/core/lib/transport/metadata.cc +- src/core/lib/transport/metadata_batch.cc +- src/core/lib/transport/pid_controller.cc +- src/core/lib/transport/static_metadata.cc +- src/core/lib/transport/status_conversion.cc +- src/core/lib/transport/status_metadata.cc +- src/core/lib/transport/timeout_encoding.cc +- src/core/lib/transport/transport.cc +- src/core/lib/transport/transport_op_string.cc +- src/core/lib/uri/uri_parser.cc +- src/core/lib/debug/trace.cc +- src/core/ext/filters/deadline/deadline_filter.cc + src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c +- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c +- src/core/ext/upb-generated/gogoproto/gogo.upb.c +- src/core/ext/upb-generated/validate/validate.upb.c +- src/core/ext/upb-generated/google/api/annotations.upb.c +- src/core/ext/upb-generated/google/api/http.upb.c +- src/core/ext/upb-generated/google/protobuf/any.upb.c +- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c +- src/core/ext/upb-generated/google/protobuf/duration.upb.c +- src/core/ext/upb-generated/google/protobuf/empty.upb.c +- src/core/ext/upb-generated/google/protobuf/struct.upb.c +- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c +- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c +- src/core/ext/upb-generated/google/rpc/status.upb.c + src/cpp/codegen/codegen_init.cc + ) + +@@ -4564,205 +4366,7 @@ add_library(grpc++_unsecure + src/cpp/util/status.cc + src/cpp/util/string_ref.cc + src/cpp/util/time_cc.cc +- src/core/ext/filters/client_channel/backend_metric.cc +- src/core/ext/filters/client_channel/backup_poller.cc +- src/core/ext/filters/client_channel/channel_connectivity.cc +- src/core/ext/filters/client_channel/client_channel.cc +- src/core/ext/filters/client_channel/client_channel_channelz.cc +- src/core/ext/filters/client_channel/client_channel_factory.cc +- src/core/ext/filters/client_channel/client_channel_plugin.cc +- src/core/ext/filters/client_channel/global_subchannel_pool.cc +- src/core/ext/filters/client_channel/health/health_check_client.cc +- src/core/ext/filters/client_channel/http_connect_handshaker.cc +- src/core/ext/filters/client_channel/http_proxy.cc +- src/core/ext/filters/client_channel/lb_policy.cc +- src/core/ext/filters/client_channel/lb_policy_registry.cc +- src/core/ext/filters/client_channel/local_subchannel_pool.cc +- src/core/ext/filters/client_channel/parse_address.cc +- src/core/ext/filters/client_channel/proxy_mapper_registry.cc +- src/core/ext/filters/client_channel/resolver.cc +- src/core/ext/filters/client_channel/resolver_registry.cc +- src/core/ext/filters/client_channel/resolver_result_parsing.cc +- src/core/ext/filters/client_channel/resolving_lb_policy.cc +- src/core/ext/filters/client_channel/retry_throttle.cc +- src/core/ext/filters/client_channel/server_address.cc +- src/core/ext/filters/client_channel/service_config.cc +- src/core/ext/filters/client_channel/subchannel.cc +- src/core/ext/filters/client_channel/subchannel_pool_interface.cc +- src/core/lib/avl/avl.cc +- src/core/lib/backoff/backoff.cc +- src/core/lib/channel/channel_args.cc +- src/core/lib/channel/channel_stack.cc +- src/core/lib/channel/channel_stack_builder.cc +- src/core/lib/channel/channel_trace.cc +- src/core/lib/channel/channelz.cc +- src/core/lib/channel/channelz_registry.cc +- src/core/lib/channel/connected_channel.cc +- src/core/lib/channel/handshaker.cc +- src/core/lib/channel/handshaker_registry.cc +- src/core/lib/channel/status_util.cc +- src/core/lib/compression/compression.cc +- src/core/lib/compression/compression_args.cc +- src/core/lib/compression/compression_internal.cc +- src/core/lib/compression/message_compress.cc +- src/core/lib/compression/stream_compression.cc +- src/core/lib/compression/stream_compression_gzip.cc +- src/core/lib/compression/stream_compression_identity.cc +- src/core/lib/debug/stats.cc +- src/core/lib/debug/stats_data.cc +- src/core/lib/http/format_request.cc +- src/core/lib/http/httpcli.cc +- src/core/lib/http/parser.cc +- src/core/lib/iomgr/buffer_list.cc +- src/core/lib/iomgr/call_combiner.cc +- src/core/lib/iomgr/cfstream_handle.cc +- src/core/lib/iomgr/combiner.cc +- src/core/lib/iomgr/endpoint.cc +- src/core/lib/iomgr/endpoint_cfstream.cc +- src/core/lib/iomgr/endpoint_pair_posix.cc +- src/core/lib/iomgr/endpoint_pair_uv.cc +- src/core/lib/iomgr/endpoint_pair_windows.cc +- src/core/lib/iomgr/error.cc +- src/core/lib/iomgr/error_cfstream.cc +- src/core/lib/iomgr/ev_epoll1_linux.cc +- src/core/lib/iomgr/ev_epollex_linux.cc +- src/core/lib/iomgr/ev_poll_posix.cc +- src/core/lib/iomgr/ev_posix.cc +- src/core/lib/iomgr/ev_windows.cc +- src/core/lib/iomgr/exec_ctx.cc +- src/core/lib/iomgr/executor.cc +- src/core/lib/iomgr/executor/mpmcqueue.cc +- src/core/lib/iomgr/executor/threadpool.cc +- src/core/lib/iomgr/fork_posix.cc +- src/core/lib/iomgr/fork_windows.cc +- src/core/lib/iomgr/gethostname_fallback.cc +- src/core/lib/iomgr/gethostname_host_name_max.cc +- src/core/lib/iomgr/gethostname_sysconf.cc +- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc +- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc +- src/core/lib/iomgr/internal_errqueue.cc +- src/core/lib/iomgr/iocp_windows.cc +- src/core/lib/iomgr/iomgr.cc +- src/core/lib/iomgr/iomgr_custom.cc +- src/core/lib/iomgr/iomgr_internal.cc +- src/core/lib/iomgr/iomgr_posix.cc +- src/core/lib/iomgr/iomgr_posix_cfstream.cc +- src/core/lib/iomgr/iomgr_uv.cc +- src/core/lib/iomgr/iomgr_windows.cc +- src/core/lib/iomgr/is_epollexclusive_available.cc +- src/core/lib/iomgr/load_file.cc +- src/core/lib/iomgr/lockfree_event.cc +- src/core/lib/iomgr/logical_thread.cc +- src/core/lib/iomgr/polling_entity.cc +- src/core/lib/iomgr/pollset.cc +- src/core/lib/iomgr/pollset_custom.cc +- src/core/lib/iomgr/pollset_set.cc +- src/core/lib/iomgr/pollset_set_custom.cc +- src/core/lib/iomgr/pollset_set_windows.cc +- src/core/lib/iomgr/pollset_uv.cc +- src/core/lib/iomgr/pollset_windows.cc +- src/core/lib/iomgr/resolve_address.cc +- src/core/lib/iomgr/resolve_address_custom.cc +- src/core/lib/iomgr/resolve_address_posix.cc +- src/core/lib/iomgr/resolve_address_windows.cc +- src/core/lib/iomgr/resource_quota.cc +- src/core/lib/iomgr/sockaddr_utils.cc +- src/core/lib/iomgr/socket_factory_posix.cc +- src/core/lib/iomgr/socket_mutator.cc +- src/core/lib/iomgr/socket_utils_common_posix.cc +- src/core/lib/iomgr/socket_utils_linux.cc +- src/core/lib/iomgr/socket_utils_posix.cc +- src/core/lib/iomgr/socket_utils_uv.cc +- src/core/lib/iomgr/socket_utils_windows.cc +- src/core/lib/iomgr/socket_windows.cc +- src/core/lib/iomgr/tcp_client.cc +- src/core/lib/iomgr/tcp_client_cfstream.cc +- src/core/lib/iomgr/tcp_client_custom.cc +- src/core/lib/iomgr/tcp_client_posix.cc +- src/core/lib/iomgr/tcp_client_windows.cc +- src/core/lib/iomgr/tcp_custom.cc +- src/core/lib/iomgr/tcp_posix.cc +- src/core/lib/iomgr/tcp_server.cc +- src/core/lib/iomgr/tcp_server_custom.cc +- src/core/lib/iomgr/tcp_server_posix.cc +- src/core/lib/iomgr/tcp_server_utils_posix_common.cc +- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc +- src/core/lib/iomgr/tcp_server_windows.cc +- src/core/lib/iomgr/tcp_uv.cc +- src/core/lib/iomgr/tcp_windows.cc +- src/core/lib/iomgr/time_averaged_stats.cc +- src/core/lib/iomgr/timer.cc +- src/core/lib/iomgr/timer_custom.cc +- src/core/lib/iomgr/timer_generic.cc +- src/core/lib/iomgr/timer_heap.cc +- src/core/lib/iomgr/timer_manager.cc +- src/core/lib/iomgr/timer_uv.cc +- src/core/lib/iomgr/udp_server.cc +- src/core/lib/iomgr/unix_sockets_posix.cc +- src/core/lib/iomgr/unix_sockets_posix_noop.cc +- src/core/lib/iomgr/wakeup_fd_eventfd.cc +- src/core/lib/iomgr/wakeup_fd_nospecial.cc +- src/core/lib/iomgr/wakeup_fd_pipe.cc +- src/core/lib/iomgr/wakeup_fd_posix.cc +- src/core/lib/json/json.cc +- src/core/lib/json/json_reader.cc +- src/core/lib/json/json_string.cc +- src/core/lib/json/json_writer.cc +- src/core/lib/slice/b64.cc +- src/core/lib/slice/percent_encoding.cc +- src/core/lib/slice/slice.cc +- src/core/lib/slice/slice_buffer.cc +- src/core/lib/slice/slice_intern.cc +- src/core/lib/slice/slice_string_helpers.cc +- src/core/lib/surface/api_trace.cc +- src/core/lib/surface/byte_buffer.cc +- src/core/lib/surface/byte_buffer_reader.cc +- src/core/lib/surface/call.cc +- src/core/lib/surface/call_details.cc +- src/core/lib/surface/call_log_batch.cc +- src/core/lib/surface/channel.cc +- src/core/lib/surface/channel_init.cc +- src/core/lib/surface/channel_ping.cc +- src/core/lib/surface/channel_stack_type.cc +- src/core/lib/surface/completion_queue.cc +- src/core/lib/surface/completion_queue_factory.cc +- src/core/lib/surface/event_string.cc +- src/core/lib/surface/lame_client.cc +- src/core/lib/surface/metadata_array.cc +- src/core/lib/surface/server.cc +- src/core/lib/surface/validate_metadata.cc +- src/core/lib/surface/version.cc +- src/core/lib/transport/bdp_estimator.cc +- src/core/lib/transport/byte_stream.cc +- src/core/lib/transport/connectivity_state.cc +- src/core/lib/transport/error_utils.cc +- src/core/lib/transport/metadata.cc +- src/core/lib/transport/metadata_batch.cc +- src/core/lib/transport/pid_controller.cc +- src/core/lib/transport/static_metadata.cc +- src/core/lib/transport/status_conversion.cc +- src/core/lib/transport/status_metadata.cc +- src/core/lib/transport/timeout_encoding.cc +- src/core/lib/transport/transport.cc +- src/core/lib/transport/transport_op_string.cc +- src/core/lib/uri/uri_parser.cc +- src/core/lib/debug/trace.cc +- src/core/ext/filters/deadline/deadline_filter.cc + src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c +- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c +- src/core/ext/upb-generated/gogoproto/gogo.upb.c +- src/core/ext/upb-generated/validate/validate.upb.c +- src/core/ext/upb-generated/google/api/annotations.upb.c +- src/core/ext/upb-generated/google/api/http.upb.c +- src/core/ext/upb-generated/google/protobuf/any.upb.c +- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c +- src/core/ext/upb-generated/google/protobuf/duration.upb.c +- src/core/ext/upb-generated/google/protobuf/empty.upb.c +- src/core/ext/upb-generated/google/protobuf/struct.upb.c +- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c +- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c +- src/core/ext/upb-generated/google/rpc/status.upb.c + src/cpp/codegen/codegen_init.cc + ) + +diff --git a/Makefile b/Makefile +index f8bd36f62f6..b25c748d3a9 100644 +--- a/Makefile ++++ b/Makefile +@@ -5695,205 +5695,7 @@ LIBGRPC++_SRC = \ + src/cpp/util/status.cc \ + src/cpp/util/string_ref.cc \ + src/cpp/util/time_cc.cc \ +- src/core/ext/filters/client_channel/backend_metric.cc \ +- src/core/ext/filters/client_channel/backup_poller.cc \ +- src/core/ext/filters/client_channel/channel_connectivity.cc \ +- src/core/ext/filters/client_channel/client_channel.cc \ +- src/core/ext/filters/client_channel/client_channel_channelz.cc \ +- src/core/ext/filters/client_channel/client_channel_factory.cc \ +- src/core/ext/filters/client_channel/client_channel_plugin.cc \ +- src/core/ext/filters/client_channel/global_subchannel_pool.cc \ +- src/core/ext/filters/client_channel/health/health_check_client.cc \ +- src/core/ext/filters/client_channel/http_connect_handshaker.cc \ +- src/core/ext/filters/client_channel/http_proxy.cc \ +- src/core/ext/filters/client_channel/lb_policy.cc \ +- src/core/ext/filters/client_channel/lb_policy_registry.cc \ +- src/core/ext/filters/client_channel/local_subchannel_pool.cc \ +- src/core/ext/filters/client_channel/parse_address.cc \ +- src/core/ext/filters/client_channel/proxy_mapper_registry.cc \ +- src/core/ext/filters/client_channel/resolver.cc \ +- src/core/ext/filters/client_channel/resolver_registry.cc \ +- src/core/ext/filters/client_channel/resolver_result_parsing.cc \ +- src/core/ext/filters/client_channel/resolving_lb_policy.cc \ +- src/core/ext/filters/client_channel/retry_throttle.cc \ +- src/core/ext/filters/client_channel/server_address.cc \ +- src/core/ext/filters/client_channel/service_config.cc \ +- src/core/ext/filters/client_channel/subchannel.cc \ +- src/core/ext/filters/client_channel/subchannel_pool_interface.cc \ +- src/core/lib/avl/avl.cc \ +- src/core/lib/backoff/backoff.cc \ +- src/core/lib/channel/channel_args.cc \ +- src/core/lib/channel/channel_stack.cc \ +- src/core/lib/channel/channel_stack_builder.cc \ +- src/core/lib/channel/channel_trace.cc \ +- src/core/lib/channel/channelz.cc \ +- src/core/lib/channel/channelz_registry.cc \ +- src/core/lib/channel/connected_channel.cc \ +- src/core/lib/channel/handshaker.cc \ +- src/core/lib/channel/handshaker_registry.cc \ +- src/core/lib/channel/status_util.cc \ +- src/core/lib/compression/compression.cc \ +- src/core/lib/compression/compression_args.cc \ +- src/core/lib/compression/compression_internal.cc \ +- src/core/lib/compression/message_compress.cc \ +- src/core/lib/compression/stream_compression.cc \ +- src/core/lib/compression/stream_compression_gzip.cc \ +- src/core/lib/compression/stream_compression_identity.cc \ +- src/core/lib/debug/stats.cc \ +- src/core/lib/debug/stats_data.cc \ +- src/core/lib/http/format_request.cc \ +- src/core/lib/http/httpcli.cc \ +- src/core/lib/http/parser.cc \ +- src/core/lib/iomgr/buffer_list.cc \ +- src/core/lib/iomgr/call_combiner.cc \ +- src/core/lib/iomgr/cfstream_handle.cc \ +- src/core/lib/iomgr/combiner.cc \ +- src/core/lib/iomgr/endpoint.cc \ +- src/core/lib/iomgr/endpoint_cfstream.cc \ +- src/core/lib/iomgr/endpoint_pair_posix.cc \ +- src/core/lib/iomgr/endpoint_pair_uv.cc \ +- src/core/lib/iomgr/endpoint_pair_windows.cc \ +- src/core/lib/iomgr/error.cc \ +- src/core/lib/iomgr/error_cfstream.cc \ +- src/core/lib/iomgr/ev_epoll1_linux.cc \ +- src/core/lib/iomgr/ev_epollex_linux.cc \ +- src/core/lib/iomgr/ev_poll_posix.cc \ +- src/core/lib/iomgr/ev_posix.cc \ +- src/core/lib/iomgr/ev_windows.cc \ +- src/core/lib/iomgr/exec_ctx.cc \ +- src/core/lib/iomgr/executor.cc \ +- src/core/lib/iomgr/executor/mpmcqueue.cc \ +- src/core/lib/iomgr/executor/threadpool.cc \ +- src/core/lib/iomgr/fork_posix.cc \ +- src/core/lib/iomgr/fork_windows.cc \ +- src/core/lib/iomgr/gethostname_fallback.cc \ +- src/core/lib/iomgr/gethostname_host_name_max.cc \ +- src/core/lib/iomgr/gethostname_sysconf.cc \ +- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ +- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ +- src/core/lib/iomgr/internal_errqueue.cc \ +- src/core/lib/iomgr/iocp_windows.cc \ +- src/core/lib/iomgr/iomgr.cc \ +- src/core/lib/iomgr/iomgr_custom.cc \ +- src/core/lib/iomgr/iomgr_internal.cc \ +- src/core/lib/iomgr/iomgr_posix.cc \ +- src/core/lib/iomgr/iomgr_posix_cfstream.cc \ +- src/core/lib/iomgr/iomgr_uv.cc \ +- src/core/lib/iomgr/iomgr_windows.cc \ +- src/core/lib/iomgr/is_epollexclusive_available.cc \ +- src/core/lib/iomgr/load_file.cc \ +- src/core/lib/iomgr/lockfree_event.cc \ +- src/core/lib/iomgr/logical_thread.cc \ +- src/core/lib/iomgr/polling_entity.cc \ +- src/core/lib/iomgr/pollset.cc \ +- src/core/lib/iomgr/pollset_custom.cc \ +- src/core/lib/iomgr/pollset_set.cc \ +- src/core/lib/iomgr/pollset_set_custom.cc \ +- src/core/lib/iomgr/pollset_set_windows.cc \ +- src/core/lib/iomgr/pollset_uv.cc \ +- src/core/lib/iomgr/pollset_windows.cc \ +- src/core/lib/iomgr/resolve_address.cc \ +- src/core/lib/iomgr/resolve_address_custom.cc \ +- src/core/lib/iomgr/resolve_address_posix.cc \ +- src/core/lib/iomgr/resolve_address_windows.cc \ +- src/core/lib/iomgr/resource_quota.cc \ +- src/core/lib/iomgr/sockaddr_utils.cc \ +- src/core/lib/iomgr/socket_factory_posix.cc \ +- src/core/lib/iomgr/socket_mutator.cc \ +- src/core/lib/iomgr/socket_utils_common_posix.cc \ +- src/core/lib/iomgr/socket_utils_linux.cc \ +- src/core/lib/iomgr/socket_utils_posix.cc \ +- src/core/lib/iomgr/socket_utils_uv.cc \ +- src/core/lib/iomgr/socket_utils_windows.cc \ +- src/core/lib/iomgr/socket_windows.cc \ +- src/core/lib/iomgr/tcp_client.cc \ +- src/core/lib/iomgr/tcp_client_cfstream.cc \ +- src/core/lib/iomgr/tcp_client_custom.cc \ +- src/core/lib/iomgr/tcp_client_posix.cc \ +- src/core/lib/iomgr/tcp_client_windows.cc \ +- src/core/lib/iomgr/tcp_custom.cc \ +- src/core/lib/iomgr/tcp_posix.cc \ +- src/core/lib/iomgr/tcp_server.cc \ +- src/core/lib/iomgr/tcp_server_custom.cc \ +- src/core/lib/iomgr/tcp_server_posix.cc \ +- src/core/lib/iomgr/tcp_server_utils_posix_common.cc \ +- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \ +- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ +- src/core/lib/iomgr/tcp_server_windows.cc \ +- src/core/lib/iomgr/tcp_uv.cc \ +- src/core/lib/iomgr/tcp_windows.cc \ +- src/core/lib/iomgr/time_averaged_stats.cc \ +- src/core/lib/iomgr/timer.cc \ +- src/core/lib/iomgr/timer_custom.cc \ +- src/core/lib/iomgr/timer_generic.cc \ +- src/core/lib/iomgr/timer_heap.cc \ +- src/core/lib/iomgr/timer_manager.cc \ +- src/core/lib/iomgr/timer_uv.cc \ +- src/core/lib/iomgr/udp_server.cc \ +- src/core/lib/iomgr/unix_sockets_posix.cc \ +- src/core/lib/iomgr/unix_sockets_posix_noop.cc \ +- src/core/lib/iomgr/wakeup_fd_eventfd.cc \ +- src/core/lib/iomgr/wakeup_fd_nospecial.cc \ +- src/core/lib/iomgr/wakeup_fd_pipe.cc \ +- src/core/lib/iomgr/wakeup_fd_posix.cc \ +- src/core/lib/json/json.cc \ +- src/core/lib/json/json_reader.cc \ +- src/core/lib/json/json_string.cc \ +- src/core/lib/json/json_writer.cc \ +- src/core/lib/slice/b64.cc \ +- src/core/lib/slice/percent_encoding.cc \ +- src/core/lib/slice/slice.cc \ +- src/core/lib/slice/slice_buffer.cc \ +- src/core/lib/slice/slice_intern.cc \ +- src/core/lib/slice/slice_string_helpers.cc \ +- src/core/lib/surface/api_trace.cc \ +- src/core/lib/surface/byte_buffer.cc \ +- src/core/lib/surface/byte_buffer_reader.cc \ +- src/core/lib/surface/call.cc \ +- src/core/lib/surface/call_details.cc \ +- src/core/lib/surface/call_log_batch.cc \ +- src/core/lib/surface/channel.cc \ +- src/core/lib/surface/channel_init.cc \ +- src/core/lib/surface/channel_ping.cc \ +- src/core/lib/surface/channel_stack_type.cc \ +- src/core/lib/surface/completion_queue.cc \ +- src/core/lib/surface/completion_queue_factory.cc \ +- src/core/lib/surface/event_string.cc \ +- src/core/lib/surface/lame_client.cc \ +- src/core/lib/surface/metadata_array.cc \ +- src/core/lib/surface/server.cc \ +- src/core/lib/surface/validate_metadata.cc \ +- src/core/lib/surface/version.cc \ +- src/core/lib/transport/bdp_estimator.cc \ +- src/core/lib/transport/byte_stream.cc \ +- src/core/lib/transport/connectivity_state.cc \ +- src/core/lib/transport/error_utils.cc \ +- src/core/lib/transport/metadata.cc \ +- src/core/lib/transport/metadata_batch.cc \ +- src/core/lib/transport/pid_controller.cc \ +- src/core/lib/transport/static_metadata.cc \ +- src/core/lib/transport/status_conversion.cc \ +- src/core/lib/transport/status_metadata.cc \ +- src/core/lib/transport/timeout_encoding.cc \ +- src/core/lib/transport/transport.cc \ +- src/core/lib/transport/transport_op_string.cc \ +- src/core/lib/uri/uri_parser.cc \ +- src/core/lib/debug/trace.cc \ +- src/core/ext/filters/deadline/deadline_filter.cc \ + src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ +- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ +- src/core/ext/upb-generated/gogoproto/gogo.upb.c \ +- src/core/ext/upb-generated/validate/validate.upb.c \ +- src/core/ext/upb-generated/google/api/annotations.upb.c \ +- src/core/ext/upb-generated/google/api/http.upb.c \ +- src/core/ext/upb-generated/google/protobuf/any.upb.c \ +- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ +- src/core/ext/upb-generated/google/protobuf/duration.upb.c \ +- src/core/ext/upb-generated/google/protobuf/empty.upb.c \ +- src/core/ext/upb-generated/google/protobuf/struct.upb.c \ +- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \ +- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \ +- src/core/ext/upb-generated/google/rpc/status.upb.c \ + src/cpp/codegen/codegen_init.cc \ + + PUBLIC_HEADERS_CXX += \ +@@ -6926,205 +6728,7 @@ LIBGRPC++_UNSECURE_SRC = \ + src/cpp/util/status.cc \ + src/cpp/util/string_ref.cc \ + src/cpp/util/time_cc.cc \ +- src/core/ext/filters/client_channel/backend_metric.cc \ +- src/core/ext/filters/client_channel/backup_poller.cc \ +- src/core/ext/filters/client_channel/channel_connectivity.cc \ +- src/core/ext/filters/client_channel/client_channel.cc \ +- src/core/ext/filters/client_channel/client_channel_channelz.cc \ +- src/core/ext/filters/client_channel/client_channel_factory.cc \ +- src/core/ext/filters/client_channel/client_channel_plugin.cc \ +- src/core/ext/filters/client_channel/global_subchannel_pool.cc \ +- src/core/ext/filters/client_channel/health/health_check_client.cc \ +- src/core/ext/filters/client_channel/http_connect_handshaker.cc \ +- src/core/ext/filters/client_channel/http_proxy.cc \ +- src/core/ext/filters/client_channel/lb_policy.cc \ +- src/core/ext/filters/client_channel/lb_policy_registry.cc \ +- src/core/ext/filters/client_channel/local_subchannel_pool.cc \ +- src/core/ext/filters/client_channel/parse_address.cc \ +- src/core/ext/filters/client_channel/proxy_mapper_registry.cc \ +- src/core/ext/filters/client_channel/resolver.cc \ +- src/core/ext/filters/client_channel/resolver_registry.cc \ +- src/core/ext/filters/client_channel/resolver_result_parsing.cc \ +- src/core/ext/filters/client_channel/resolving_lb_policy.cc \ +- src/core/ext/filters/client_channel/retry_throttle.cc \ +- src/core/ext/filters/client_channel/server_address.cc \ +- src/core/ext/filters/client_channel/service_config.cc \ +- src/core/ext/filters/client_channel/subchannel.cc \ +- src/core/ext/filters/client_channel/subchannel_pool_interface.cc \ +- src/core/lib/avl/avl.cc \ +- src/core/lib/backoff/backoff.cc \ +- src/core/lib/channel/channel_args.cc \ +- src/core/lib/channel/channel_stack.cc \ +- src/core/lib/channel/channel_stack_builder.cc \ +- src/core/lib/channel/channel_trace.cc \ +- src/core/lib/channel/channelz.cc \ +- src/core/lib/channel/channelz_registry.cc \ +- src/core/lib/channel/connected_channel.cc \ +- src/core/lib/channel/handshaker.cc \ +- src/core/lib/channel/handshaker_registry.cc \ +- src/core/lib/channel/status_util.cc \ +- src/core/lib/compression/compression.cc \ +- src/core/lib/compression/compression_args.cc \ +- src/core/lib/compression/compression_internal.cc \ +- src/core/lib/compression/message_compress.cc \ +- src/core/lib/compression/stream_compression.cc \ +- src/core/lib/compression/stream_compression_gzip.cc \ +- src/core/lib/compression/stream_compression_identity.cc \ +- src/core/lib/debug/stats.cc \ +- src/core/lib/debug/stats_data.cc \ +- src/core/lib/http/format_request.cc \ +- src/core/lib/http/httpcli.cc \ +- src/core/lib/http/parser.cc \ +- src/core/lib/iomgr/buffer_list.cc \ +- src/core/lib/iomgr/call_combiner.cc \ +- src/core/lib/iomgr/cfstream_handle.cc \ +- src/core/lib/iomgr/combiner.cc \ +- src/core/lib/iomgr/endpoint.cc \ +- src/core/lib/iomgr/endpoint_cfstream.cc \ +- src/core/lib/iomgr/endpoint_pair_posix.cc \ +- src/core/lib/iomgr/endpoint_pair_uv.cc \ +- src/core/lib/iomgr/endpoint_pair_windows.cc \ +- src/core/lib/iomgr/error.cc \ +- src/core/lib/iomgr/error_cfstream.cc \ +- src/core/lib/iomgr/ev_epoll1_linux.cc \ +- src/core/lib/iomgr/ev_epollex_linux.cc \ +- src/core/lib/iomgr/ev_poll_posix.cc \ +- src/core/lib/iomgr/ev_posix.cc \ +- src/core/lib/iomgr/ev_windows.cc \ +- src/core/lib/iomgr/exec_ctx.cc \ +- src/core/lib/iomgr/executor.cc \ +- src/core/lib/iomgr/executor/mpmcqueue.cc \ +- src/core/lib/iomgr/executor/threadpool.cc \ +- src/core/lib/iomgr/fork_posix.cc \ +- src/core/lib/iomgr/fork_windows.cc \ +- src/core/lib/iomgr/gethostname_fallback.cc \ +- src/core/lib/iomgr/gethostname_host_name_max.cc \ +- src/core/lib/iomgr/gethostname_sysconf.cc \ +- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ +- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ +- src/core/lib/iomgr/internal_errqueue.cc \ +- src/core/lib/iomgr/iocp_windows.cc \ +- src/core/lib/iomgr/iomgr.cc \ +- src/core/lib/iomgr/iomgr_custom.cc \ +- src/core/lib/iomgr/iomgr_internal.cc \ +- src/core/lib/iomgr/iomgr_posix.cc \ +- src/core/lib/iomgr/iomgr_posix_cfstream.cc \ +- src/core/lib/iomgr/iomgr_uv.cc \ +- src/core/lib/iomgr/iomgr_windows.cc \ +- src/core/lib/iomgr/is_epollexclusive_available.cc \ +- src/core/lib/iomgr/load_file.cc \ +- src/core/lib/iomgr/lockfree_event.cc \ +- src/core/lib/iomgr/logical_thread.cc \ +- src/core/lib/iomgr/polling_entity.cc \ +- src/core/lib/iomgr/pollset.cc \ +- src/core/lib/iomgr/pollset_custom.cc \ +- src/core/lib/iomgr/pollset_set.cc \ +- src/core/lib/iomgr/pollset_set_custom.cc \ +- src/core/lib/iomgr/pollset_set_windows.cc \ +- src/core/lib/iomgr/pollset_uv.cc \ +- src/core/lib/iomgr/pollset_windows.cc \ +- src/core/lib/iomgr/resolve_address.cc \ +- src/core/lib/iomgr/resolve_address_custom.cc \ +- src/core/lib/iomgr/resolve_address_posix.cc \ +- src/core/lib/iomgr/resolve_address_windows.cc \ +- src/core/lib/iomgr/resource_quota.cc \ +- src/core/lib/iomgr/sockaddr_utils.cc \ +- src/core/lib/iomgr/socket_factory_posix.cc \ +- src/core/lib/iomgr/socket_mutator.cc \ +- src/core/lib/iomgr/socket_utils_common_posix.cc \ +- src/core/lib/iomgr/socket_utils_linux.cc \ +- src/core/lib/iomgr/socket_utils_posix.cc \ +- src/core/lib/iomgr/socket_utils_uv.cc \ +- src/core/lib/iomgr/socket_utils_windows.cc \ +- src/core/lib/iomgr/socket_windows.cc \ +- src/core/lib/iomgr/tcp_client.cc \ +- src/core/lib/iomgr/tcp_client_cfstream.cc \ +- src/core/lib/iomgr/tcp_client_custom.cc \ +- src/core/lib/iomgr/tcp_client_posix.cc \ +- src/core/lib/iomgr/tcp_client_windows.cc \ +- src/core/lib/iomgr/tcp_custom.cc \ +- src/core/lib/iomgr/tcp_posix.cc \ +- src/core/lib/iomgr/tcp_server.cc \ +- src/core/lib/iomgr/tcp_server_custom.cc \ +- src/core/lib/iomgr/tcp_server_posix.cc \ +- src/core/lib/iomgr/tcp_server_utils_posix_common.cc \ +- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \ +- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ +- src/core/lib/iomgr/tcp_server_windows.cc \ +- src/core/lib/iomgr/tcp_uv.cc \ +- src/core/lib/iomgr/tcp_windows.cc \ +- src/core/lib/iomgr/time_averaged_stats.cc \ +- src/core/lib/iomgr/timer.cc \ +- src/core/lib/iomgr/timer_custom.cc \ +- src/core/lib/iomgr/timer_generic.cc \ +- src/core/lib/iomgr/timer_heap.cc \ +- src/core/lib/iomgr/timer_manager.cc \ +- src/core/lib/iomgr/timer_uv.cc \ +- src/core/lib/iomgr/udp_server.cc \ +- src/core/lib/iomgr/unix_sockets_posix.cc \ +- src/core/lib/iomgr/unix_sockets_posix_noop.cc \ +- src/core/lib/iomgr/wakeup_fd_eventfd.cc \ +- src/core/lib/iomgr/wakeup_fd_nospecial.cc \ +- src/core/lib/iomgr/wakeup_fd_pipe.cc \ +- src/core/lib/iomgr/wakeup_fd_posix.cc \ +- src/core/lib/json/json.cc \ +- src/core/lib/json/json_reader.cc \ +- src/core/lib/json/json_string.cc \ +- src/core/lib/json/json_writer.cc \ +- src/core/lib/slice/b64.cc \ +- src/core/lib/slice/percent_encoding.cc \ +- src/core/lib/slice/slice.cc \ +- src/core/lib/slice/slice_buffer.cc \ +- src/core/lib/slice/slice_intern.cc \ +- src/core/lib/slice/slice_string_helpers.cc \ +- src/core/lib/surface/api_trace.cc \ +- src/core/lib/surface/byte_buffer.cc \ +- src/core/lib/surface/byte_buffer_reader.cc \ +- src/core/lib/surface/call.cc \ +- src/core/lib/surface/call_details.cc \ +- src/core/lib/surface/call_log_batch.cc \ +- src/core/lib/surface/channel.cc \ +- src/core/lib/surface/channel_init.cc \ +- src/core/lib/surface/channel_ping.cc \ +- src/core/lib/surface/channel_stack_type.cc \ +- src/core/lib/surface/completion_queue.cc \ +- src/core/lib/surface/completion_queue_factory.cc \ +- src/core/lib/surface/event_string.cc \ +- src/core/lib/surface/lame_client.cc \ +- src/core/lib/surface/metadata_array.cc \ +- src/core/lib/surface/server.cc \ +- src/core/lib/surface/validate_metadata.cc \ +- src/core/lib/surface/version.cc \ +- src/core/lib/transport/bdp_estimator.cc \ +- src/core/lib/transport/byte_stream.cc \ +- src/core/lib/transport/connectivity_state.cc \ +- src/core/lib/transport/error_utils.cc \ +- src/core/lib/transport/metadata.cc \ +- src/core/lib/transport/metadata_batch.cc \ +- src/core/lib/transport/pid_controller.cc \ +- src/core/lib/transport/static_metadata.cc \ +- src/core/lib/transport/status_conversion.cc \ +- src/core/lib/transport/status_metadata.cc \ +- src/core/lib/transport/timeout_encoding.cc \ +- src/core/lib/transport/transport.cc \ +- src/core/lib/transport/transport_op_string.cc \ +- src/core/lib/uri/uri_parser.cc \ +- src/core/lib/debug/trace.cc \ +- src/core/ext/filters/deadline/deadline_filter.cc \ + src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ +- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ +- src/core/ext/upb-generated/gogoproto/gogo.upb.c \ +- src/core/ext/upb-generated/validate/validate.upb.c \ +- src/core/ext/upb-generated/google/api/annotations.upb.c \ +- src/core/ext/upb-generated/google/api/http.upb.c \ +- src/core/ext/upb-generated/google/protobuf/any.upb.c \ +- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ +- src/core/ext/upb-generated/google/protobuf/duration.upb.c \ +- src/core/ext/upb-generated/google/protobuf/empty.upb.c \ +- src/core/ext/upb-generated/google/protobuf/struct.upb.c \ +- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \ +- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \ +- src/core/ext/upb-generated/google/rpc/status.upb.c \ + src/cpp/codegen/codegen_init.cc \ + + PUBLIC_HEADERS_CXX += \ +diff --git a/build.yaml b/build.yaml +index 003ff5038de..214fbc619de 100644 +--- a/build.yaml ++++ b/build.yaml +@@ -601,7 +601,6 @@ filegroups: + uses: + - gpr_base_headers + - grpc_base_headers +- - grpc_client_channel + - grpc_health_upb + - grpc_transport_inproc_headers + - grpc++_codegen_base +diff --git a/grpc.gyp b/grpc.gyp +index 1dbb8e61295..7e2e0ead0a4 100644 +--- a/grpc.gyp ++++ b/grpc.gyp +@@ -1547,205 +1547,7 @@ + 'src/cpp/util/status.cc', + 'src/cpp/util/string_ref.cc', + 'src/cpp/util/time_cc.cc', +- 'src/core/ext/filters/client_channel/backend_metric.cc', +- 'src/core/ext/filters/client_channel/backup_poller.cc', +- 'src/core/ext/filters/client_channel/channel_connectivity.cc', +- 'src/core/ext/filters/client_channel/client_channel.cc', +- 'src/core/ext/filters/client_channel/client_channel_channelz.cc', +- 'src/core/ext/filters/client_channel/client_channel_factory.cc', +- 'src/core/ext/filters/client_channel/client_channel_plugin.cc', +- 'src/core/ext/filters/client_channel/global_subchannel_pool.cc', +- 'src/core/ext/filters/client_channel/health/health_check_client.cc', +- 'src/core/ext/filters/client_channel/http_connect_handshaker.cc', +- 'src/core/ext/filters/client_channel/http_proxy.cc', +- 'src/core/ext/filters/client_channel/lb_policy.cc', +- 'src/core/ext/filters/client_channel/lb_policy_registry.cc', +- 'src/core/ext/filters/client_channel/local_subchannel_pool.cc', +- 'src/core/ext/filters/client_channel/parse_address.cc', +- 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', +- 'src/core/ext/filters/client_channel/resolver.cc', +- 'src/core/ext/filters/client_channel/resolver_registry.cc', +- 'src/core/ext/filters/client_channel/resolver_result_parsing.cc', +- 'src/core/ext/filters/client_channel/resolving_lb_policy.cc', +- 'src/core/ext/filters/client_channel/retry_throttle.cc', +- 'src/core/ext/filters/client_channel/server_address.cc', +- 'src/core/ext/filters/client_channel/service_config.cc', +- 'src/core/ext/filters/client_channel/subchannel.cc', +- 'src/core/ext/filters/client_channel/subchannel_pool_interface.cc', +- 'src/core/lib/avl/avl.cc', +- 'src/core/lib/backoff/backoff.cc', +- 'src/core/lib/channel/channel_args.cc', +- 'src/core/lib/channel/channel_stack.cc', +- 'src/core/lib/channel/channel_stack_builder.cc', +- 'src/core/lib/channel/channel_trace.cc', +- 'src/core/lib/channel/channelz.cc', +- 'src/core/lib/channel/channelz_registry.cc', +- 'src/core/lib/channel/connected_channel.cc', +- 'src/core/lib/channel/handshaker.cc', +- 'src/core/lib/channel/handshaker_registry.cc', +- 'src/core/lib/channel/status_util.cc', +- 'src/core/lib/compression/compression.cc', +- 'src/core/lib/compression/compression_args.cc', +- 'src/core/lib/compression/compression_internal.cc', +- 'src/core/lib/compression/message_compress.cc', +- 'src/core/lib/compression/stream_compression.cc', +- 'src/core/lib/compression/stream_compression_gzip.cc', +- 'src/core/lib/compression/stream_compression_identity.cc', +- 'src/core/lib/debug/stats.cc', +- 'src/core/lib/debug/stats_data.cc', +- 'src/core/lib/http/format_request.cc', +- 'src/core/lib/http/httpcli.cc', +- 'src/core/lib/http/parser.cc', +- 'src/core/lib/iomgr/buffer_list.cc', +- 'src/core/lib/iomgr/call_combiner.cc', +- 'src/core/lib/iomgr/cfstream_handle.cc', +- 'src/core/lib/iomgr/combiner.cc', +- 'src/core/lib/iomgr/endpoint.cc', +- 'src/core/lib/iomgr/endpoint_cfstream.cc', +- 'src/core/lib/iomgr/endpoint_pair_posix.cc', +- 'src/core/lib/iomgr/endpoint_pair_uv.cc', +- 'src/core/lib/iomgr/endpoint_pair_windows.cc', +- 'src/core/lib/iomgr/error.cc', +- 'src/core/lib/iomgr/error_cfstream.cc', +- 'src/core/lib/iomgr/ev_epoll1_linux.cc', +- 'src/core/lib/iomgr/ev_epollex_linux.cc', +- 'src/core/lib/iomgr/ev_poll_posix.cc', +- 'src/core/lib/iomgr/ev_posix.cc', +- 'src/core/lib/iomgr/ev_windows.cc', +- 'src/core/lib/iomgr/exec_ctx.cc', +- 'src/core/lib/iomgr/executor.cc', +- 'src/core/lib/iomgr/executor/mpmcqueue.cc', +- 'src/core/lib/iomgr/executor/threadpool.cc', +- 'src/core/lib/iomgr/fork_posix.cc', +- 'src/core/lib/iomgr/fork_windows.cc', +- 'src/core/lib/iomgr/gethostname_fallback.cc', +- 'src/core/lib/iomgr/gethostname_host_name_max.cc', +- 'src/core/lib/iomgr/gethostname_sysconf.cc', +- 'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc', +- 'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc', +- 'src/core/lib/iomgr/internal_errqueue.cc', +- 'src/core/lib/iomgr/iocp_windows.cc', +- 'src/core/lib/iomgr/iomgr.cc', +- 'src/core/lib/iomgr/iomgr_custom.cc', +- 'src/core/lib/iomgr/iomgr_internal.cc', +- 'src/core/lib/iomgr/iomgr_posix.cc', +- 'src/core/lib/iomgr/iomgr_posix_cfstream.cc', +- 'src/core/lib/iomgr/iomgr_uv.cc', +- 'src/core/lib/iomgr/iomgr_windows.cc', +- 'src/core/lib/iomgr/is_epollexclusive_available.cc', +- 'src/core/lib/iomgr/load_file.cc', +- 'src/core/lib/iomgr/lockfree_event.cc', +- 'src/core/lib/iomgr/logical_thread.cc', +- 'src/core/lib/iomgr/polling_entity.cc', +- 'src/core/lib/iomgr/pollset.cc', +- 'src/core/lib/iomgr/pollset_custom.cc', +- 'src/core/lib/iomgr/pollset_set.cc', +- 'src/core/lib/iomgr/pollset_set_custom.cc', +- 'src/core/lib/iomgr/pollset_set_windows.cc', +- 'src/core/lib/iomgr/pollset_uv.cc', +- 'src/core/lib/iomgr/pollset_windows.cc', +- 'src/core/lib/iomgr/resolve_address.cc', +- 'src/core/lib/iomgr/resolve_address_custom.cc', +- 'src/core/lib/iomgr/resolve_address_posix.cc', +- 'src/core/lib/iomgr/resolve_address_windows.cc', +- 'src/core/lib/iomgr/resource_quota.cc', +- 'src/core/lib/iomgr/sockaddr_utils.cc', +- 'src/core/lib/iomgr/socket_factory_posix.cc', +- 'src/core/lib/iomgr/socket_mutator.cc', +- 'src/core/lib/iomgr/socket_utils_common_posix.cc', +- 'src/core/lib/iomgr/socket_utils_linux.cc', +- 'src/core/lib/iomgr/socket_utils_posix.cc', +- 'src/core/lib/iomgr/socket_utils_uv.cc', +- 'src/core/lib/iomgr/socket_utils_windows.cc', +- 'src/core/lib/iomgr/socket_windows.cc', +- 'src/core/lib/iomgr/tcp_client.cc', +- 'src/core/lib/iomgr/tcp_client_cfstream.cc', +- 'src/core/lib/iomgr/tcp_client_custom.cc', +- 'src/core/lib/iomgr/tcp_client_posix.cc', +- 'src/core/lib/iomgr/tcp_client_windows.cc', +- 'src/core/lib/iomgr/tcp_custom.cc', +- 'src/core/lib/iomgr/tcp_posix.cc', +- 'src/core/lib/iomgr/tcp_server.cc', +- 'src/core/lib/iomgr/tcp_server_custom.cc', +- 'src/core/lib/iomgr/tcp_server_posix.cc', +- 'src/core/lib/iomgr/tcp_server_utils_posix_common.cc', +- 'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc', +- 'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', +- 'src/core/lib/iomgr/tcp_server_windows.cc', +- 'src/core/lib/iomgr/tcp_uv.cc', +- 'src/core/lib/iomgr/tcp_windows.cc', +- 'src/core/lib/iomgr/time_averaged_stats.cc', +- 'src/core/lib/iomgr/timer.cc', +- 'src/core/lib/iomgr/timer_custom.cc', +- 'src/core/lib/iomgr/timer_generic.cc', +- 'src/core/lib/iomgr/timer_heap.cc', +- 'src/core/lib/iomgr/timer_manager.cc', +- 'src/core/lib/iomgr/timer_uv.cc', +- 'src/core/lib/iomgr/udp_server.cc', +- 'src/core/lib/iomgr/unix_sockets_posix.cc', +- 'src/core/lib/iomgr/unix_sockets_posix_noop.cc', +- 'src/core/lib/iomgr/wakeup_fd_eventfd.cc', +- 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', +- 'src/core/lib/iomgr/wakeup_fd_pipe.cc', +- 'src/core/lib/iomgr/wakeup_fd_posix.cc', +- 'src/core/lib/json/json.cc', +- 'src/core/lib/json/json_reader.cc', +- 'src/core/lib/json/json_string.cc', +- 'src/core/lib/json/json_writer.cc', +- 'src/core/lib/slice/b64.cc', +- 'src/core/lib/slice/percent_encoding.cc', +- 'src/core/lib/slice/slice.cc', +- 'src/core/lib/slice/slice_buffer.cc', +- 'src/core/lib/slice/slice_intern.cc', +- 'src/core/lib/slice/slice_string_helpers.cc', +- 'src/core/lib/surface/api_trace.cc', +- 'src/core/lib/surface/byte_buffer.cc', +- 'src/core/lib/surface/byte_buffer_reader.cc', +- 'src/core/lib/surface/call.cc', +- 'src/core/lib/surface/call_details.cc', +- 'src/core/lib/surface/call_log_batch.cc', +- 'src/core/lib/surface/channel.cc', +- 'src/core/lib/surface/channel_init.cc', +- 'src/core/lib/surface/channel_ping.cc', +- 'src/core/lib/surface/channel_stack_type.cc', +- 'src/core/lib/surface/completion_queue.cc', +- 'src/core/lib/surface/completion_queue_factory.cc', +- 'src/core/lib/surface/event_string.cc', +- 'src/core/lib/surface/lame_client.cc', +- 'src/core/lib/surface/metadata_array.cc', +- 'src/core/lib/surface/server.cc', +- 'src/core/lib/surface/validate_metadata.cc', +- 'src/core/lib/surface/version.cc', +- 'src/core/lib/transport/bdp_estimator.cc', +- 'src/core/lib/transport/byte_stream.cc', +- 'src/core/lib/transport/connectivity_state.cc', +- 'src/core/lib/transport/error_utils.cc', +- 'src/core/lib/transport/metadata.cc', +- 'src/core/lib/transport/metadata_batch.cc', +- 'src/core/lib/transport/pid_controller.cc', +- 'src/core/lib/transport/static_metadata.cc', +- 'src/core/lib/transport/status_conversion.cc', +- 'src/core/lib/transport/status_metadata.cc', +- 'src/core/lib/transport/timeout_encoding.cc', +- 'src/core/lib/transport/transport.cc', +- 'src/core/lib/transport/transport_op_string.cc', +- 'src/core/lib/uri/uri_parser.cc', +- 'src/core/lib/debug/trace.cc', +- 'src/core/ext/filters/deadline/deadline_filter.cc', + 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', +- 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c', +- 'src/core/ext/upb-generated/gogoproto/gogo.upb.c', +- 'src/core/ext/upb-generated/validate/validate.upb.c', +- 'src/core/ext/upb-generated/google/api/annotations.upb.c', +- 'src/core/ext/upb-generated/google/api/http.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/any.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/duration.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/empty.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/struct.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c', +- 'src/core/ext/upb-generated/google/rpc/status.upb.c', + 'src/cpp/codegen/codegen_init.cc', + ], + }, +@@ -1901,205 +1703,7 @@ + 'src/cpp/util/status.cc', + 'src/cpp/util/string_ref.cc', + 'src/cpp/util/time_cc.cc', +- 'src/core/ext/filters/client_channel/backend_metric.cc', +- 'src/core/ext/filters/client_channel/backup_poller.cc', +- 'src/core/ext/filters/client_channel/channel_connectivity.cc', +- 'src/core/ext/filters/client_channel/client_channel.cc', +- 'src/core/ext/filters/client_channel/client_channel_channelz.cc', +- 'src/core/ext/filters/client_channel/client_channel_factory.cc', +- 'src/core/ext/filters/client_channel/client_channel_plugin.cc', +- 'src/core/ext/filters/client_channel/global_subchannel_pool.cc', +- 'src/core/ext/filters/client_channel/health/health_check_client.cc', +- 'src/core/ext/filters/client_channel/http_connect_handshaker.cc', +- 'src/core/ext/filters/client_channel/http_proxy.cc', +- 'src/core/ext/filters/client_channel/lb_policy.cc', +- 'src/core/ext/filters/client_channel/lb_policy_registry.cc', +- 'src/core/ext/filters/client_channel/local_subchannel_pool.cc', +- 'src/core/ext/filters/client_channel/parse_address.cc', +- 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', +- 'src/core/ext/filters/client_channel/resolver.cc', +- 'src/core/ext/filters/client_channel/resolver_registry.cc', +- 'src/core/ext/filters/client_channel/resolver_result_parsing.cc', +- 'src/core/ext/filters/client_channel/resolving_lb_policy.cc', +- 'src/core/ext/filters/client_channel/retry_throttle.cc', +- 'src/core/ext/filters/client_channel/server_address.cc', +- 'src/core/ext/filters/client_channel/service_config.cc', +- 'src/core/ext/filters/client_channel/subchannel.cc', +- 'src/core/ext/filters/client_channel/subchannel_pool_interface.cc', +- 'src/core/lib/avl/avl.cc', +- 'src/core/lib/backoff/backoff.cc', +- 'src/core/lib/channel/channel_args.cc', +- 'src/core/lib/channel/channel_stack.cc', +- 'src/core/lib/channel/channel_stack_builder.cc', +- 'src/core/lib/channel/channel_trace.cc', +- 'src/core/lib/channel/channelz.cc', +- 'src/core/lib/channel/channelz_registry.cc', +- 'src/core/lib/channel/connected_channel.cc', +- 'src/core/lib/channel/handshaker.cc', +- 'src/core/lib/channel/handshaker_registry.cc', +- 'src/core/lib/channel/status_util.cc', +- 'src/core/lib/compression/compression.cc', +- 'src/core/lib/compression/compression_args.cc', +- 'src/core/lib/compression/compression_internal.cc', +- 'src/core/lib/compression/message_compress.cc', +- 'src/core/lib/compression/stream_compression.cc', +- 'src/core/lib/compression/stream_compression_gzip.cc', +- 'src/core/lib/compression/stream_compression_identity.cc', +- 'src/core/lib/debug/stats.cc', +- 'src/core/lib/debug/stats_data.cc', +- 'src/core/lib/http/format_request.cc', +- 'src/core/lib/http/httpcli.cc', +- 'src/core/lib/http/parser.cc', +- 'src/core/lib/iomgr/buffer_list.cc', +- 'src/core/lib/iomgr/call_combiner.cc', +- 'src/core/lib/iomgr/cfstream_handle.cc', +- 'src/core/lib/iomgr/combiner.cc', +- 'src/core/lib/iomgr/endpoint.cc', +- 'src/core/lib/iomgr/endpoint_cfstream.cc', +- 'src/core/lib/iomgr/endpoint_pair_posix.cc', +- 'src/core/lib/iomgr/endpoint_pair_uv.cc', +- 'src/core/lib/iomgr/endpoint_pair_windows.cc', +- 'src/core/lib/iomgr/error.cc', +- 'src/core/lib/iomgr/error_cfstream.cc', +- 'src/core/lib/iomgr/ev_epoll1_linux.cc', +- 'src/core/lib/iomgr/ev_epollex_linux.cc', +- 'src/core/lib/iomgr/ev_poll_posix.cc', +- 'src/core/lib/iomgr/ev_posix.cc', +- 'src/core/lib/iomgr/ev_windows.cc', +- 'src/core/lib/iomgr/exec_ctx.cc', +- 'src/core/lib/iomgr/executor.cc', +- 'src/core/lib/iomgr/executor/mpmcqueue.cc', +- 'src/core/lib/iomgr/executor/threadpool.cc', +- 'src/core/lib/iomgr/fork_posix.cc', +- 'src/core/lib/iomgr/fork_windows.cc', +- 'src/core/lib/iomgr/gethostname_fallback.cc', +- 'src/core/lib/iomgr/gethostname_host_name_max.cc', +- 'src/core/lib/iomgr/gethostname_sysconf.cc', +- 'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc', +- 'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc', +- 'src/core/lib/iomgr/internal_errqueue.cc', +- 'src/core/lib/iomgr/iocp_windows.cc', +- 'src/core/lib/iomgr/iomgr.cc', +- 'src/core/lib/iomgr/iomgr_custom.cc', +- 'src/core/lib/iomgr/iomgr_internal.cc', +- 'src/core/lib/iomgr/iomgr_posix.cc', +- 'src/core/lib/iomgr/iomgr_posix_cfstream.cc', +- 'src/core/lib/iomgr/iomgr_uv.cc', +- 'src/core/lib/iomgr/iomgr_windows.cc', +- 'src/core/lib/iomgr/is_epollexclusive_available.cc', +- 'src/core/lib/iomgr/load_file.cc', +- 'src/core/lib/iomgr/lockfree_event.cc', +- 'src/core/lib/iomgr/logical_thread.cc', +- 'src/core/lib/iomgr/polling_entity.cc', +- 'src/core/lib/iomgr/pollset.cc', +- 'src/core/lib/iomgr/pollset_custom.cc', +- 'src/core/lib/iomgr/pollset_set.cc', +- 'src/core/lib/iomgr/pollset_set_custom.cc', +- 'src/core/lib/iomgr/pollset_set_windows.cc', +- 'src/core/lib/iomgr/pollset_uv.cc', +- 'src/core/lib/iomgr/pollset_windows.cc', +- 'src/core/lib/iomgr/resolve_address.cc', +- 'src/core/lib/iomgr/resolve_address_custom.cc', +- 'src/core/lib/iomgr/resolve_address_posix.cc', +- 'src/core/lib/iomgr/resolve_address_windows.cc', +- 'src/core/lib/iomgr/resource_quota.cc', +- 'src/core/lib/iomgr/sockaddr_utils.cc', +- 'src/core/lib/iomgr/socket_factory_posix.cc', +- 'src/core/lib/iomgr/socket_mutator.cc', +- 'src/core/lib/iomgr/socket_utils_common_posix.cc', +- 'src/core/lib/iomgr/socket_utils_linux.cc', +- 'src/core/lib/iomgr/socket_utils_posix.cc', +- 'src/core/lib/iomgr/socket_utils_uv.cc', +- 'src/core/lib/iomgr/socket_utils_windows.cc', +- 'src/core/lib/iomgr/socket_windows.cc', +- 'src/core/lib/iomgr/tcp_client.cc', +- 'src/core/lib/iomgr/tcp_client_cfstream.cc', +- 'src/core/lib/iomgr/tcp_client_custom.cc', +- 'src/core/lib/iomgr/tcp_client_posix.cc', +- 'src/core/lib/iomgr/tcp_client_windows.cc', +- 'src/core/lib/iomgr/tcp_custom.cc', +- 'src/core/lib/iomgr/tcp_posix.cc', +- 'src/core/lib/iomgr/tcp_server.cc', +- 'src/core/lib/iomgr/tcp_server_custom.cc', +- 'src/core/lib/iomgr/tcp_server_posix.cc', +- 'src/core/lib/iomgr/tcp_server_utils_posix_common.cc', +- 'src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc', +- 'src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc', +- 'src/core/lib/iomgr/tcp_server_windows.cc', +- 'src/core/lib/iomgr/tcp_uv.cc', +- 'src/core/lib/iomgr/tcp_windows.cc', +- 'src/core/lib/iomgr/time_averaged_stats.cc', +- 'src/core/lib/iomgr/timer.cc', +- 'src/core/lib/iomgr/timer_custom.cc', +- 'src/core/lib/iomgr/timer_generic.cc', +- 'src/core/lib/iomgr/timer_heap.cc', +- 'src/core/lib/iomgr/timer_manager.cc', +- 'src/core/lib/iomgr/timer_uv.cc', +- 'src/core/lib/iomgr/udp_server.cc', +- 'src/core/lib/iomgr/unix_sockets_posix.cc', +- 'src/core/lib/iomgr/unix_sockets_posix_noop.cc', +- 'src/core/lib/iomgr/wakeup_fd_eventfd.cc', +- 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', +- 'src/core/lib/iomgr/wakeup_fd_pipe.cc', +- 'src/core/lib/iomgr/wakeup_fd_posix.cc', +- 'src/core/lib/json/json.cc', +- 'src/core/lib/json/json_reader.cc', +- 'src/core/lib/json/json_string.cc', +- 'src/core/lib/json/json_writer.cc', +- 'src/core/lib/slice/b64.cc', +- 'src/core/lib/slice/percent_encoding.cc', +- 'src/core/lib/slice/slice.cc', +- 'src/core/lib/slice/slice_buffer.cc', +- 'src/core/lib/slice/slice_intern.cc', +- 'src/core/lib/slice/slice_string_helpers.cc', +- 'src/core/lib/surface/api_trace.cc', +- 'src/core/lib/surface/byte_buffer.cc', +- 'src/core/lib/surface/byte_buffer_reader.cc', +- 'src/core/lib/surface/call.cc', +- 'src/core/lib/surface/call_details.cc', +- 'src/core/lib/surface/call_log_batch.cc', +- 'src/core/lib/surface/channel.cc', +- 'src/core/lib/surface/channel_init.cc', +- 'src/core/lib/surface/channel_ping.cc', +- 'src/core/lib/surface/channel_stack_type.cc', +- 'src/core/lib/surface/completion_queue.cc', +- 'src/core/lib/surface/completion_queue_factory.cc', +- 'src/core/lib/surface/event_string.cc', +- 'src/core/lib/surface/lame_client.cc', +- 'src/core/lib/surface/metadata_array.cc', +- 'src/core/lib/surface/server.cc', +- 'src/core/lib/surface/validate_metadata.cc', +- 'src/core/lib/surface/version.cc', +- 'src/core/lib/transport/bdp_estimator.cc', +- 'src/core/lib/transport/byte_stream.cc', +- 'src/core/lib/transport/connectivity_state.cc', +- 'src/core/lib/transport/error_utils.cc', +- 'src/core/lib/transport/metadata.cc', +- 'src/core/lib/transport/metadata_batch.cc', +- 'src/core/lib/transport/pid_controller.cc', +- 'src/core/lib/transport/static_metadata.cc', +- 'src/core/lib/transport/status_conversion.cc', +- 'src/core/lib/transport/status_metadata.cc', +- 'src/core/lib/transport/timeout_encoding.cc', +- 'src/core/lib/transport/transport.cc', +- 'src/core/lib/transport/transport_op_string.cc', +- 'src/core/lib/uri/uri_parser.cc', +- 'src/core/lib/debug/trace.cc', +- 'src/core/ext/filters/deadline/deadline_filter.cc', + 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', +- 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c', +- 'src/core/ext/upb-generated/gogoproto/gogo.upb.c', +- 'src/core/ext/upb-generated/validate/validate.upb.c', +- 'src/core/ext/upb-generated/google/api/annotations.upb.c', +- 'src/core/ext/upb-generated/google/api/http.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/any.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/duration.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/empty.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/struct.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c', +- 'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c', +- 'src/core/ext/upb-generated/google/rpc/status.upb.c', + 'src/cpp/codegen/codegen_init.cc', + ], + }, +diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal +index dc84a6f3fd7..f3c1bad6b7a 100644 +--- a/tools/doxygen/Doxyfile.c++.internal ++++ b/tools/doxygen/Doxyfile.c++.internal +@@ -1063,135 +1063,32 @@ include/grpcpp/support/sync_stream.h \ + include/grpcpp/support/sync_stream_impl.h \ + include/grpcpp/support/time.h \ + include/grpcpp/support/validate_service_config.h \ +-src/core/ext/filters/client_channel/backend_metric.cc \ +-src/core/ext/filters/client_channel/backend_metric.h \ +-src/core/ext/filters/client_channel/backup_poller.cc \ +-src/core/ext/filters/client_channel/backup_poller.h \ +-src/core/ext/filters/client_channel/channel_connectivity.cc \ +-src/core/ext/filters/client_channel/client_channel.cc \ +-src/core/ext/filters/client_channel/client_channel.h \ +-src/core/ext/filters/client_channel/client_channel_channelz.cc \ +-src/core/ext/filters/client_channel/client_channel_channelz.h \ +-src/core/ext/filters/client_channel/client_channel_factory.cc \ +-src/core/ext/filters/client_channel/client_channel_factory.h \ +-src/core/ext/filters/client_channel/client_channel_plugin.cc \ +-src/core/ext/filters/client_channel/connector.h \ +-src/core/ext/filters/client_channel/global_subchannel_pool.cc \ +-src/core/ext/filters/client_channel/global_subchannel_pool.h \ +-src/core/ext/filters/client_channel/health/health_check_client.cc \ +-src/core/ext/filters/client_channel/health/health_check_client.h \ +-src/core/ext/filters/client_channel/http_connect_handshaker.cc \ +-src/core/ext/filters/client_channel/http_connect_handshaker.h \ +-src/core/ext/filters/client_channel/http_proxy.cc \ +-src/core/ext/filters/client_channel/http_proxy.h \ +-src/core/ext/filters/client_channel/lb_policy.cc \ +-src/core/ext/filters/client_channel/lb_policy.h \ +-src/core/ext/filters/client_channel/lb_policy_factory.h \ +-src/core/ext/filters/client_channel/lb_policy_registry.cc \ +-src/core/ext/filters/client_channel/lb_policy_registry.h \ +-src/core/ext/filters/client_channel/local_subchannel_pool.cc \ +-src/core/ext/filters/client_channel/local_subchannel_pool.h \ +-src/core/ext/filters/client_channel/parse_address.cc \ +-src/core/ext/filters/client_channel/parse_address.h \ +-src/core/ext/filters/client_channel/proxy_mapper.h \ +-src/core/ext/filters/client_channel/proxy_mapper_registry.cc \ +-src/core/ext/filters/client_channel/proxy_mapper_registry.h \ +-src/core/ext/filters/client_channel/resolver.cc \ +-src/core/ext/filters/client_channel/resolver.h \ +-src/core/ext/filters/client_channel/resolver_factory.h \ +-src/core/ext/filters/client_channel/resolver_registry.cc \ +-src/core/ext/filters/client_channel/resolver_registry.h \ +-src/core/ext/filters/client_channel/resolver_result_parsing.cc \ +-src/core/ext/filters/client_channel/resolver_result_parsing.h \ +-src/core/ext/filters/client_channel/resolving_lb_policy.cc \ +-src/core/ext/filters/client_channel/resolving_lb_policy.h \ +-src/core/ext/filters/client_channel/retry_throttle.cc \ +-src/core/ext/filters/client_channel/retry_throttle.h \ +-src/core/ext/filters/client_channel/server_address.cc \ +-src/core/ext/filters/client_channel/server_address.h \ +-src/core/ext/filters/client_channel/service_config.cc \ +-src/core/ext/filters/client_channel/service_config.h \ +-src/core/ext/filters/client_channel/subchannel.cc \ +-src/core/ext/filters/client_channel/subchannel.h \ +-src/core/ext/filters/client_channel/subchannel_interface.h \ +-src/core/ext/filters/client_channel/subchannel_pool_interface.cc \ +-src/core/ext/filters/client_channel/subchannel_pool_interface.h \ +-src/core/ext/filters/deadline/deadline_filter.cc \ +-src/core/ext/filters/deadline/deadline_filter.h \ + src/core/ext/transport/inproc/inproc_transport.h \ +-src/core/ext/upb-generated/gogoproto/gogo.upb.c \ +-src/core/ext/upb-generated/gogoproto/gogo.upb.h \ +-src/core/ext/upb-generated/google/api/annotations.upb.c \ +-src/core/ext/upb-generated/google/api/annotations.upb.h \ +-src/core/ext/upb-generated/google/api/http.upb.c \ +-src/core/ext/upb-generated/google/api/http.upb.h \ +-src/core/ext/upb-generated/google/protobuf/any.upb.c \ +-src/core/ext/upb-generated/google/protobuf/any.upb.h \ +-src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \ +-src/core/ext/upb-generated/google/protobuf/descriptor.upb.h \ +-src/core/ext/upb-generated/google/protobuf/duration.upb.c \ +-src/core/ext/upb-generated/google/protobuf/duration.upb.h \ +-src/core/ext/upb-generated/google/protobuf/empty.upb.c \ +-src/core/ext/upb-generated/google/protobuf/empty.upb.h \ +-src/core/ext/upb-generated/google/protobuf/struct.upb.c \ +-src/core/ext/upb-generated/google/protobuf/struct.upb.h \ +-src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \ +-src/core/ext/upb-generated/google/protobuf/timestamp.upb.h \ +-src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \ +-src/core/ext/upb-generated/google/protobuf/wrappers.upb.h \ +-src/core/ext/upb-generated/google/rpc/status.upb.c \ +-src/core/ext/upb-generated/google/rpc/status.upb.h \ + src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ + src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h \ +-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ +-src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \ +-src/core/ext/upb-generated/validate/validate.upb.c \ +-src/core/ext/upb-generated/validate/validate.upb.h \ +-src/core/lib/avl/avl.cc \ + src/core/lib/avl/avl.h \ +-src/core/lib/backoff/backoff.cc \ + src/core/lib/backoff/backoff.h \ +-src/core/lib/channel/channel_args.cc \ + src/core/lib/channel/channel_args.h \ +-src/core/lib/channel/channel_stack.cc \ + src/core/lib/channel/channel_stack.h \ +-src/core/lib/channel/channel_stack_builder.cc \ + src/core/lib/channel/channel_stack_builder.h \ +-src/core/lib/channel/channel_trace.cc \ + src/core/lib/channel/channel_trace.h \ +-src/core/lib/channel/channelz.cc \ + src/core/lib/channel/channelz.h \ +-src/core/lib/channel/channelz_registry.cc \ + src/core/lib/channel/channelz_registry.h \ +-src/core/lib/channel/connected_channel.cc \ + src/core/lib/channel/connected_channel.h \ + src/core/lib/channel/context.h \ +-src/core/lib/channel/handshaker.cc \ + src/core/lib/channel/handshaker.h \ + src/core/lib/channel/handshaker_factory.h \ +-src/core/lib/channel/handshaker_registry.cc \ + src/core/lib/channel/handshaker_registry.h \ +-src/core/lib/channel/status_util.cc \ + src/core/lib/channel/status_util.h \ + src/core/lib/compression/algorithm_metadata.h \ +-src/core/lib/compression/compression.cc \ +-src/core/lib/compression/compression_args.cc \ + src/core/lib/compression/compression_args.h \ +-src/core/lib/compression/compression_internal.cc \ + src/core/lib/compression/compression_internal.h \ +-src/core/lib/compression/message_compress.cc \ + src/core/lib/compression/message_compress.h \ +-src/core/lib/compression/stream_compression.cc \ + src/core/lib/compression/stream_compression.h \ +-src/core/lib/compression/stream_compression_gzip.cc \ + src/core/lib/compression/stream_compression_gzip.h \ +-src/core/lib/compression/stream_compression_identity.cc \ + src/core/lib/compression/stream_compression_identity.h \ +-src/core/lib/debug/stats.cc \ + src/core/lib/debug/stats.h \ +-src/core/lib/debug/stats_data.cc \ + src/core/lib/debug/stats_data.h \ +-src/core/lib/debug/trace.cc \ + src/core/lib/debug/trace.h \ + src/core/lib/gpr/alloc.h \ + src/core/lib/gpr/arena.h \ +@@ -1228,257 +1125,120 @@ src/core/lib/gprpp/ref_counted_ptr.h \ + src/core/lib/gprpp/string_view.h \ + src/core/lib/gprpp/sync.h \ + src/core/lib/gprpp/thd.h \ +-src/core/lib/http/format_request.cc \ + src/core/lib/http/format_request.h \ +-src/core/lib/http/httpcli.cc \ + src/core/lib/http/httpcli.h \ +-src/core/lib/http/parser.cc \ + src/core/lib/http/parser.h \ + src/core/lib/iomgr/block_annotate.h \ +-src/core/lib/iomgr/buffer_list.cc \ + src/core/lib/iomgr/buffer_list.h \ +-src/core/lib/iomgr/call_combiner.cc \ + src/core/lib/iomgr/call_combiner.h \ +-src/core/lib/iomgr/cfstream_handle.cc \ + src/core/lib/iomgr/cfstream_handle.h \ + src/core/lib/iomgr/closure.h \ +-src/core/lib/iomgr/combiner.cc \ + src/core/lib/iomgr/combiner.h \ + src/core/lib/iomgr/dynamic_annotations.h \ +-src/core/lib/iomgr/endpoint.cc \ + src/core/lib/iomgr/endpoint.h \ +-src/core/lib/iomgr/endpoint_cfstream.cc \ + src/core/lib/iomgr/endpoint_cfstream.h \ + src/core/lib/iomgr/endpoint_pair.h \ +-src/core/lib/iomgr/endpoint_pair_posix.cc \ +-src/core/lib/iomgr/endpoint_pair_uv.cc \ +-src/core/lib/iomgr/endpoint_pair_windows.cc \ +-src/core/lib/iomgr/error.cc \ + src/core/lib/iomgr/error.h \ +-src/core/lib/iomgr/error_cfstream.cc \ + src/core/lib/iomgr/error_cfstream.h \ + src/core/lib/iomgr/error_internal.h \ +-src/core/lib/iomgr/ev_epoll1_linux.cc \ + src/core/lib/iomgr/ev_epoll1_linux.h \ +-src/core/lib/iomgr/ev_epollex_linux.cc \ + src/core/lib/iomgr/ev_epollex_linux.h \ +-src/core/lib/iomgr/ev_poll_posix.cc \ + src/core/lib/iomgr/ev_poll_posix.h \ +-src/core/lib/iomgr/ev_posix.cc \ + src/core/lib/iomgr/ev_posix.h \ +-src/core/lib/iomgr/ev_windows.cc \ +-src/core/lib/iomgr/exec_ctx.cc \ + src/core/lib/iomgr/exec_ctx.h \ +-src/core/lib/iomgr/executor.cc \ + src/core/lib/iomgr/executor.h \ +-src/core/lib/iomgr/executor/mpmcqueue.cc \ + src/core/lib/iomgr/executor/mpmcqueue.h \ +-src/core/lib/iomgr/executor/threadpool.cc \ + src/core/lib/iomgr/executor/threadpool.h \ +-src/core/lib/iomgr/fork_posix.cc \ +-src/core/lib/iomgr/fork_windows.cc \ + src/core/lib/iomgr/gethostname.h \ +-src/core/lib/iomgr/gethostname_fallback.cc \ +-src/core/lib/iomgr/gethostname_host_name_max.cc \ +-src/core/lib/iomgr/gethostname_sysconf.cc \ + src/core/lib/iomgr/grpc_if_nametoindex.h \ +-src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ +-src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ +-src/core/lib/iomgr/internal_errqueue.cc \ + src/core/lib/iomgr/internal_errqueue.h \ +-src/core/lib/iomgr/iocp_windows.cc \ + src/core/lib/iomgr/iocp_windows.h \ +-src/core/lib/iomgr/iomgr.cc \ + src/core/lib/iomgr/iomgr.h \ +-src/core/lib/iomgr/iomgr_custom.cc \ + src/core/lib/iomgr/iomgr_custom.h \ +-src/core/lib/iomgr/iomgr_internal.cc \ + src/core/lib/iomgr/iomgr_internal.h \ +-src/core/lib/iomgr/iomgr_posix.cc \ + src/core/lib/iomgr/iomgr_posix.h \ +-src/core/lib/iomgr/iomgr_posix_cfstream.cc \ +-src/core/lib/iomgr/iomgr_uv.cc \ +-src/core/lib/iomgr/iomgr_windows.cc \ +-src/core/lib/iomgr/is_epollexclusive_available.cc \ + src/core/lib/iomgr/is_epollexclusive_available.h \ +-src/core/lib/iomgr/load_file.cc \ + src/core/lib/iomgr/load_file.h \ +-src/core/lib/iomgr/lockfree_event.cc \ + src/core/lib/iomgr/lockfree_event.h \ +-src/core/lib/iomgr/logical_thread.cc \ + src/core/lib/iomgr/logical_thread.h \ + src/core/lib/iomgr/nameser.h \ +-src/core/lib/iomgr/polling_entity.cc \ + src/core/lib/iomgr/polling_entity.h \ +-src/core/lib/iomgr/pollset.cc \ + src/core/lib/iomgr/pollset.h \ +-src/core/lib/iomgr/pollset_custom.cc \ + src/core/lib/iomgr/pollset_custom.h \ +-src/core/lib/iomgr/pollset_set.cc \ + src/core/lib/iomgr/pollset_set.h \ +-src/core/lib/iomgr/pollset_set_custom.cc \ + src/core/lib/iomgr/pollset_set_custom.h \ +-src/core/lib/iomgr/pollset_set_windows.cc \ + src/core/lib/iomgr/pollset_set_windows.h \ +-src/core/lib/iomgr/pollset_uv.cc \ +-src/core/lib/iomgr/pollset_windows.cc \ + src/core/lib/iomgr/pollset_windows.h \ + src/core/lib/iomgr/port.h \ +-src/core/lib/iomgr/resolve_address.cc \ + src/core/lib/iomgr/resolve_address.h \ +-src/core/lib/iomgr/resolve_address_custom.cc \ + src/core/lib/iomgr/resolve_address_custom.h \ +-src/core/lib/iomgr/resolve_address_posix.cc \ +-src/core/lib/iomgr/resolve_address_windows.cc \ +-src/core/lib/iomgr/resource_quota.cc \ + src/core/lib/iomgr/resource_quota.h \ + src/core/lib/iomgr/sockaddr.h \ + src/core/lib/iomgr/sockaddr_custom.h \ + src/core/lib/iomgr/sockaddr_posix.h \ +-src/core/lib/iomgr/sockaddr_utils.cc \ + src/core/lib/iomgr/sockaddr_utils.h \ + src/core/lib/iomgr/sockaddr_windows.h \ +-src/core/lib/iomgr/socket_factory_posix.cc \ + src/core/lib/iomgr/socket_factory_posix.h \ +-src/core/lib/iomgr/socket_mutator.cc \ + src/core/lib/iomgr/socket_mutator.h \ + src/core/lib/iomgr/socket_utils.h \ +-src/core/lib/iomgr/socket_utils_common_posix.cc \ +-src/core/lib/iomgr/socket_utils_linux.cc \ +-src/core/lib/iomgr/socket_utils_posix.cc \ + src/core/lib/iomgr/socket_utils_posix.h \ +-src/core/lib/iomgr/socket_utils_uv.cc \ +-src/core/lib/iomgr/socket_utils_windows.cc \ +-src/core/lib/iomgr/socket_windows.cc \ + src/core/lib/iomgr/socket_windows.h \ + src/core/lib/iomgr/sys_epoll_wrapper.h \ +-src/core/lib/iomgr/tcp_client.cc \ + src/core/lib/iomgr/tcp_client.h \ +-src/core/lib/iomgr/tcp_client_cfstream.cc \ +-src/core/lib/iomgr/tcp_client_custom.cc \ +-src/core/lib/iomgr/tcp_client_posix.cc \ + src/core/lib/iomgr/tcp_client_posix.h \ +-src/core/lib/iomgr/tcp_client_windows.cc \ +-src/core/lib/iomgr/tcp_custom.cc \ + src/core/lib/iomgr/tcp_custom.h \ +-src/core/lib/iomgr/tcp_posix.cc \ + src/core/lib/iomgr/tcp_posix.h \ +-src/core/lib/iomgr/tcp_server.cc \ + src/core/lib/iomgr/tcp_server.h \ +-src/core/lib/iomgr/tcp_server_custom.cc \ +-src/core/lib/iomgr/tcp_server_posix.cc \ + src/core/lib/iomgr/tcp_server_utils_posix.h \ +-src/core/lib/iomgr/tcp_server_utils_posix_common.cc \ +-src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \ +-src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \ +-src/core/lib/iomgr/tcp_server_windows.cc \ +-src/core/lib/iomgr/tcp_uv.cc \ +-src/core/lib/iomgr/tcp_windows.cc \ + src/core/lib/iomgr/tcp_windows.h \ +-src/core/lib/iomgr/time_averaged_stats.cc \ + src/core/lib/iomgr/time_averaged_stats.h \ +-src/core/lib/iomgr/timer.cc \ + src/core/lib/iomgr/timer.h \ +-src/core/lib/iomgr/timer_custom.cc \ + src/core/lib/iomgr/timer_custom.h \ +-src/core/lib/iomgr/timer_generic.cc \ +-src/core/lib/iomgr/timer_heap.cc \ + src/core/lib/iomgr/timer_heap.h \ +-src/core/lib/iomgr/timer_manager.cc \ + src/core/lib/iomgr/timer_manager.h \ +-src/core/lib/iomgr/timer_uv.cc \ +-src/core/lib/iomgr/udp_server.cc \ + src/core/lib/iomgr/udp_server.h \ +-src/core/lib/iomgr/unix_sockets_posix.cc \ + src/core/lib/iomgr/unix_sockets_posix.h \ +-src/core/lib/iomgr/unix_sockets_posix_noop.cc \ +-src/core/lib/iomgr/wakeup_fd_eventfd.cc \ +-src/core/lib/iomgr/wakeup_fd_nospecial.cc \ +-src/core/lib/iomgr/wakeup_fd_pipe.cc \ + src/core/lib/iomgr/wakeup_fd_pipe.h \ +-src/core/lib/iomgr/wakeup_fd_posix.cc \ + src/core/lib/iomgr/wakeup_fd_posix.h \ +-src/core/lib/json/json.cc \ + src/core/lib/json/json.h \ + src/core/lib/json/json_common.h \ +-src/core/lib/json/json_reader.cc \ + src/core/lib/json/json_reader.h \ +-src/core/lib/json/json_string.cc \ +-src/core/lib/json/json_writer.cc \ + src/core/lib/json/json_writer.h \ + src/core/lib/profiling/timers.h \ +-src/core/lib/slice/b64.cc \ + src/core/lib/slice/b64.h \ +-src/core/lib/slice/percent_encoding.cc \ + src/core/lib/slice/percent_encoding.h \ +-src/core/lib/slice/slice.cc \ +-src/core/lib/slice/slice_buffer.cc \ + src/core/lib/slice/slice_hash_table.h \ +-src/core/lib/slice/slice_intern.cc \ + src/core/lib/slice/slice_internal.h \ +-src/core/lib/slice/slice_string_helpers.cc \ + src/core/lib/slice/slice_string_helpers.h \ + src/core/lib/slice/slice_utils.h \ + src/core/lib/slice/slice_weak_hash_table.h \ +-src/core/lib/surface/api_trace.cc \ + src/core/lib/surface/api_trace.h \ +-src/core/lib/surface/byte_buffer.cc \ +-src/core/lib/surface/byte_buffer_reader.cc \ +-src/core/lib/surface/call.cc \ + src/core/lib/surface/call.h \ +-src/core/lib/surface/call_details.cc \ +-src/core/lib/surface/call_log_batch.cc \ + src/core/lib/surface/call_test_only.h \ +-src/core/lib/surface/channel.cc \ + src/core/lib/surface/channel.h \ +-src/core/lib/surface/channel_init.cc \ + src/core/lib/surface/channel_init.h \ +-src/core/lib/surface/channel_ping.cc \ +-src/core/lib/surface/channel_stack_type.cc \ + src/core/lib/surface/channel_stack_type.h \ +-src/core/lib/surface/completion_queue.cc \ + src/core/lib/surface/completion_queue.h \ +-src/core/lib/surface/completion_queue_factory.cc \ + src/core/lib/surface/completion_queue_factory.h \ +-src/core/lib/surface/event_string.cc \ + src/core/lib/surface/event_string.h \ + src/core/lib/surface/init.h \ +-src/core/lib/surface/lame_client.cc \ + src/core/lib/surface/lame_client.h \ +-src/core/lib/surface/metadata_array.cc \ +-src/core/lib/surface/server.cc \ + src/core/lib/surface/server.h \ +-src/core/lib/surface/validate_metadata.cc \ + src/core/lib/surface/validate_metadata.h \ +-src/core/lib/surface/version.cc \ +-src/core/lib/transport/bdp_estimator.cc \ + src/core/lib/transport/bdp_estimator.h \ +-src/core/lib/transport/byte_stream.cc \ + src/core/lib/transport/byte_stream.h \ +-src/core/lib/transport/connectivity_state.cc \ + src/core/lib/transport/connectivity_state.h \ +-src/core/lib/transport/error_utils.cc \ + src/core/lib/transport/error_utils.h \ + src/core/lib/transport/http2_errors.h \ +-src/core/lib/transport/metadata.cc \ + src/core/lib/transport/metadata.h \ +-src/core/lib/transport/metadata_batch.cc \ + src/core/lib/transport/metadata_batch.h \ +-src/core/lib/transport/pid_controller.cc \ + src/core/lib/transport/pid_controller.h \ +-src/core/lib/transport/static_metadata.cc \ + src/core/lib/transport/static_metadata.h \ +-src/core/lib/transport/status_conversion.cc \ + src/core/lib/transport/status_conversion.h \ +-src/core/lib/transport/status_metadata.cc \ + src/core/lib/transport/status_metadata.h \ +-src/core/lib/transport/timeout_encoding.cc \ + src/core/lib/transport/timeout_encoding.h \ +-src/core/lib/transport/transport.cc \ + src/core/lib/transport/transport.h \ + src/core/lib/transport/transport_impl.h \ +-src/core/lib/transport/transport_op_string.cc \ +-src/core/lib/uri/uri_parser.cc \ + src/core/lib/uri/uri_parser.h \ + src/cpp/README.md \ + src/cpp/client/channel_cc.cc \ diff --git a/SOURCES/99f8a10aec994a8957fbb6787768b444ef34d6a2.patch b/SOURCES/99f8a10aec994a8957fbb6787768b444ef34d6a2.patch new file mode 100644 index 0000000..cb3c9f6 --- /dev/null +++ b/SOURCES/99f8a10aec994a8957fbb6787768b444ef34d6a2.patch @@ -0,0 +1,1025 @@ +From 99f8a10aec994a8957fbb6787768b444ef34d6a2 Mon Sep 17 00:00:00 2001 +From: Esun Kim +Date: Tue, 10 Dec 2019 22:48:33 -0800 +Subject: [PATCH] Make gRPC podspec template more robust + +--- + gRPC-C++.podspec | 360 ++++++--------------------- + gRPC-Core.podspec | 105 ++++---- + templates/gRPC-C++.podspec.template | 179 ++++++------- + templates/gRPC-Core.podspec.template | 132 +++++----- + 4 files changed, 268 insertions(+), 508 deletions(-) + +diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec +index 5a9a2c0add2..3eafd3550d6 100644 +--- a/gRPC-C++.podspec ++++ b/gRPC-C++.podspec +@@ -19,7 +19,6 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +- + Pod::Spec.new do |s| + s.name = 'gRPC-C++' + # TODO (mxyan): use version that match gRPC version when pod is stabilized +@@ -65,6 +64,7 @@ Pod::Spec.new do |s| + } + + s.libraries = 'c++' ++ s.compiler_flags = '-Wno-comma' + + s.default_subspecs = 'Interface', 'Implementation' + +@@ -213,66 +213,9 @@ Pod::Spec.new do |s| + ss.header_mappings_dir = '.' + ss.dependency "#{s.name}/Interface", version + ss.dependency 'gRPC-Core', version ++ abseil_version = '0.20190808.1' + + ss.source_files = 'include/grpcpp/impl/codegen/core_codegen.h', +- 'src/cpp/client/channel_cc.cc', +- 'src/cpp/client/client_context.cc', +- 'src/cpp/client/client_interceptor.cc', +- 'src/cpp/client/create_channel.cc', +- 'src/cpp/client/create_channel_internal.cc', +- 'src/cpp/client/create_channel_internal.h', +- 'src/cpp/client/create_channel_posix.cc', +- 'src/cpp/client/credentials_cc.cc', +- 'src/cpp/client/generic_stub.cc', +- 'src/cpp/client/insecure_credentials.cc', +- 'src/cpp/client/secure_credentials.cc', +- 'src/cpp/client/secure_credentials.h', +- 'src/cpp/codegen/codegen_init.cc', +- 'src/cpp/common/alarm.cc', +- 'src/cpp/common/auth_property_iterator.cc', +- 'src/cpp/common/channel_arguments.cc', +- 'src/cpp/common/channel_filter.cc', +- 'src/cpp/common/channel_filter.h', +- 'src/cpp/common/completion_queue_cc.cc', +- 'src/cpp/common/core_codegen.cc', +- 'src/cpp/common/resource_quota_cc.cc', +- 'src/cpp/common/rpc_method.cc', +- 'src/cpp/common/secure_auth_context.cc', +- 'src/cpp/common/secure_auth_context.h', +- 'src/cpp/common/secure_channel_arguments.cc', +- 'src/cpp/common/secure_create_auth_context.cc', +- 'src/cpp/common/tls_credentials_options.cc', +- 'src/cpp/common/tls_credentials_options_util.cc', +- 'src/cpp/common/tls_credentials_options_util.h', +- 'src/cpp/common/validate_service_config.cc', +- 'src/cpp/common/version_cc.cc', +- 'src/cpp/server/async_generic_service.cc', +- 'src/cpp/server/channel_argument_option.cc', +- 'src/cpp/server/create_default_thread_pool.cc', +- 'src/cpp/server/dynamic_thread_pool.cc', +- 'src/cpp/server/dynamic_thread_pool.h', +- 'src/cpp/server/external_connection_acceptor_impl.cc', +- 'src/cpp/server/external_connection_acceptor_impl.h', +- 'src/cpp/server/health/default_health_check_service.cc', +- 'src/cpp/server/health/default_health_check_service.h', +- 'src/cpp/server/health/health_check_service.cc', +- 'src/cpp/server/health/health_check_service_server_builder_option.cc', +- 'src/cpp/server/insecure_server_credentials.cc', +- 'src/cpp/server/secure_server_credentials.cc', +- 'src/cpp/server/secure_server_credentials.h', +- 'src/cpp/server/server_builder.cc', +- 'src/cpp/server/server_callback.cc', +- 'src/cpp/server/server_cc.cc', +- 'src/cpp/server/server_context.cc', +- 'src/cpp/server/server_credentials.cc', +- 'src/cpp/server/server_posix.cc', +- 'src/cpp/server/thread_pool_interface.h', +- 'src/cpp/thread_manager/thread_manager.cc', +- 'src/cpp/thread_manager/thread_manager.h', +- 'src/cpp/util/byte_buffer_cc.cc', +- 'src/cpp/util/status.cc', +- 'src/cpp/util/string_ref.cc', +- 'src/cpp/util/time_cc.cc', + 'src/core/ext/filters/client_channel/backend_metric.h', + 'src/core/ext/filters/client_channel/backup_poller.h', + 'src/core/ext/filters/client_channel/client_channel.h', +@@ -628,6 +571,64 @@ Pod::Spec.new do |s| + 'src/core/tsi/transport_security.h', + 'src/core/tsi/transport_security_grpc.h', + 'src/core/tsi/transport_security_interface.h', ++ 'src/cpp/client/channel_cc.cc', ++ 'src/cpp/client/client_context.cc', ++ 'src/cpp/client/client_interceptor.cc', ++ 'src/cpp/client/create_channel.cc', ++ 'src/cpp/client/create_channel_internal.cc', ++ 'src/cpp/client/create_channel_internal.h', ++ 'src/cpp/client/create_channel_posix.cc', ++ 'src/cpp/client/credentials_cc.cc', ++ 'src/cpp/client/generic_stub.cc', ++ 'src/cpp/client/insecure_credentials.cc', ++ 'src/cpp/client/secure_credentials.cc', ++ 'src/cpp/client/secure_credentials.h', ++ 'src/cpp/codegen/codegen_init.cc', ++ 'src/cpp/common/alarm.cc', ++ 'src/cpp/common/auth_property_iterator.cc', ++ 'src/cpp/common/channel_arguments.cc', ++ 'src/cpp/common/channel_filter.cc', ++ 'src/cpp/common/channel_filter.h', ++ 'src/cpp/common/completion_queue_cc.cc', ++ 'src/cpp/common/core_codegen.cc', ++ 'src/cpp/common/resource_quota_cc.cc', ++ 'src/cpp/common/rpc_method.cc', ++ 'src/cpp/common/secure_auth_context.cc', ++ 'src/cpp/common/secure_auth_context.h', ++ 'src/cpp/common/secure_channel_arguments.cc', ++ 'src/cpp/common/secure_create_auth_context.cc', ++ 'src/cpp/common/tls_credentials_options.cc', ++ 'src/cpp/common/tls_credentials_options_util.cc', ++ 'src/cpp/common/tls_credentials_options_util.h', ++ 'src/cpp/common/validate_service_config.cc', ++ 'src/cpp/common/version_cc.cc', ++ 'src/cpp/server/async_generic_service.cc', ++ 'src/cpp/server/channel_argument_option.cc', ++ 'src/cpp/server/create_default_thread_pool.cc', ++ 'src/cpp/server/dynamic_thread_pool.cc', ++ 'src/cpp/server/dynamic_thread_pool.h', ++ 'src/cpp/server/external_connection_acceptor_impl.cc', ++ 'src/cpp/server/external_connection_acceptor_impl.h', ++ 'src/cpp/server/health/default_health_check_service.cc', ++ 'src/cpp/server/health/default_health_check_service.h', ++ 'src/cpp/server/health/health_check_service.cc', ++ 'src/cpp/server/health/health_check_service_server_builder_option.cc', ++ 'src/cpp/server/insecure_server_credentials.cc', ++ 'src/cpp/server/secure_server_credentials.cc', ++ 'src/cpp/server/secure_server_credentials.h', ++ 'src/cpp/server/server_builder.cc', ++ 'src/cpp/server/server_callback.cc', ++ 'src/cpp/server/server_cc.cc', ++ 'src/cpp/server/server_context.cc', ++ 'src/cpp/server/server_credentials.cc', ++ 'src/cpp/server/server_posix.cc', ++ 'src/cpp/server/thread_pool_interface.h', ++ 'src/cpp/thread_manager/thread_manager.cc', ++ 'src/cpp/thread_manager/thread_manager.h', ++ 'src/cpp/util/byte_buffer_cc.cc', ++ 'src/cpp/util/status.cc', ++ 'src/cpp/util/string_ref.cc', ++ 'src/cpp/util/time_cc.cc', + 'third_party/upb/upb/decode.h', + 'third_party/upb/upb/encode.h', + 'third_party/upb/upb/generated_util.h', +@@ -638,235 +639,6 @@ Pod::Spec.new do |s| + 'third_party/upb/upb/upb.h' + + ss.private_header_files = 'include/grpcpp/impl/codegen/core_codegen.h', +- 'src/core/ext/filters/client_channel/backend_metric.h', +- 'src/core/ext/filters/client_channel/backup_poller.h', +- 'src/core/ext/filters/client_channel/client_channel.h', +- 'src/core/ext/filters/client_channel/client_channel_channelz.h', +- 'src/core/ext/filters/client_channel/client_channel_factory.h', +- 'src/core/ext/filters/client_channel/connector.h', +- 'src/core/ext/filters/client_channel/global_subchannel_pool.h', +- 'src/core/ext/filters/client_channel/health/health_check_client.h', +- 'src/core/ext/filters/client_channel/http_connect_handshaker.h', +- 'src/core/ext/filters/client_channel/http_proxy.h', +- 'src/core/ext/filters/client_channel/lb_policy.h', +- 'src/core/ext/filters/client_channel/lb_policy_factory.h', +- 'src/core/ext/filters/client_channel/lb_policy_registry.h', +- 'src/core/ext/filters/client_channel/local_subchannel_pool.h', +- 'src/core/ext/filters/client_channel/parse_address.h', +- 'src/core/ext/filters/client_channel/proxy_mapper.h', +- 'src/core/ext/filters/client_channel/proxy_mapper_registry.h', +- 'src/core/ext/filters/client_channel/resolver.h', +- 'src/core/ext/filters/client_channel/resolver_factory.h', +- 'src/core/ext/filters/client_channel/resolver_registry.h', +- 'src/core/ext/filters/client_channel/resolver_result_parsing.h', +- 'src/core/ext/filters/client_channel/resolving_lb_policy.h', +- 'src/core/ext/filters/client_channel/retry_throttle.h', +- 'src/core/ext/filters/client_channel/server_address.h', +- 'src/core/ext/filters/client_channel/service_config.h', +- 'src/core/ext/filters/client_channel/subchannel.h', +- 'src/core/ext/filters/client_channel/subchannel_interface.h', +- 'src/core/ext/filters/client_channel/subchannel_pool_interface.h', +- 'src/core/ext/filters/deadline/deadline_filter.h', +- 'src/core/ext/transport/inproc/inproc_transport.h', +- 'src/core/ext/upb-generated/gogoproto/gogo.upb.h', +- 'src/core/ext/upb-generated/google/api/annotations.upb.h', +- 'src/core/ext/upb-generated/google/api/http.upb.h', +- 'src/core/ext/upb-generated/google/protobuf/any.upb.h', +- 'src/core/ext/upb-generated/google/protobuf/descriptor.upb.h', +- 'src/core/ext/upb-generated/google/protobuf/duration.upb.h', +- 'src/core/ext/upb-generated/google/protobuf/empty.upb.h', +- 'src/core/ext/upb-generated/google/protobuf/struct.upb.h', +- 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.h', +- 'src/core/ext/upb-generated/google/protobuf/wrappers.upb.h', +- 'src/core/ext/upb-generated/google/rpc/status.upb.h', +- 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h', +- 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h', +- 'src/core/ext/upb-generated/validate/validate.upb.h', +- 'src/core/lib/avl/avl.h', +- 'src/core/lib/backoff/backoff.h', +- 'src/core/lib/channel/channel_args.h', +- 'src/core/lib/channel/channel_stack.h', +- 'src/core/lib/channel/channel_stack_builder.h', +- 'src/core/lib/channel/channel_trace.h', +- 'src/core/lib/channel/channelz.h', +- 'src/core/lib/channel/channelz_registry.h', +- 'src/core/lib/channel/connected_channel.h', +- 'src/core/lib/channel/context.h', +- 'src/core/lib/channel/handshaker.h', +- 'src/core/lib/channel/handshaker_factory.h', +- 'src/core/lib/channel/handshaker_registry.h', +- 'src/core/lib/channel/status_util.h', +- 'src/core/lib/compression/algorithm_metadata.h', +- 'src/core/lib/compression/compression_args.h', +- 'src/core/lib/compression/compression_internal.h', +- 'src/core/lib/compression/message_compress.h', +- 'src/core/lib/compression/stream_compression.h', +- 'src/core/lib/compression/stream_compression_gzip.h', +- 'src/core/lib/compression/stream_compression_identity.h', +- 'src/core/lib/debug/stats.h', +- 'src/core/lib/debug/stats_data.h', +- 'src/core/lib/debug/trace.h', +- 'src/core/lib/gpr/alloc.h', +- 'src/core/lib/gpr/arena.h', +- 'src/core/lib/gpr/env.h', +- 'src/core/lib/gpr/murmur_hash.h', +- 'src/core/lib/gpr/spinlock.h', +- 'src/core/lib/gpr/string.h', +- 'src/core/lib/gpr/string_windows.h', +- 'src/core/lib/gpr/time_precise.h', +- 'src/core/lib/gpr/tls.h', +- 'src/core/lib/gpr/tls_gcc.h', +- 'src/core/lib/gpr/tls_msvc.h', +- 'src/core/lib/gpr/tls_pthread.h', +- 'src/core/lib/gpr/tmpfile.h', +- 'src/core/lib/gpr/useful.h', +- 'src/core/lib/gprpp/arena.h', +- 'src/core/lib/gprpp/atomic.h', +- 'src/core/lib/gprpp/debug_location.h', +- 'src/core/lib/gprpp/fork.h', +- 'src/core/lib/gprpp/global_config.h', +- 'src/core/lib/gprpp/global_config_custom.h', +- 'src/core/lib/gprpp/global_config_env.h', +- 'src/core/lib/gprpp/global_config_generic.h', +- 'src/core/lib/gprpp/host_port.h', +- 'src/core/lib/gprpp/inlined_vector.h', +- 'src/core/lib/gprpp/manual_constructor.h', +- 'src/core/lib/gprpp/map.h', +- 'src/core/lib/gprpp/memory.h', +- 'src/core/lib/gprpp/mpscq.h', +- 'src/core/lib/gprpp/optional.h', +- 'src/core/lib/gprpp/orphanable.h', +- 'src/core/lib/gprpp/ref_counted.h', +- 'src/core/lib/gprpp/ref_counted_ptr.h', +- 'src/core/lib/gprpp/string_view.h', +- 'src/core/lib/gprpp/sync.h', +- 'src/core/lib/gprpp/thd.h', +- 'src/core/lib/http/format_request.h', +- 'src/core/lib/http/httpcli.h', +- 'src/core/lib/http/parser.h', +- 'src/core/lib/iomgr/block_annotate.h', +- 'src/core/lib/iomgr/buffer_list.h', +- 'src/core/lib/iomgr/call_combiner.h', +- 'src/core/lib/iomgr/cfstream_handle.h', +- 'src/core/lib/iomgr/closure.h', +- 'src/core/lib/iomgr/combiner.h', +- 'src/core/lib/iomgr/dynamic_annotations.h', +- 'src/core/lib/iomgr/endpoint.h', +- 'src/core/lib/iomgr/endpoint_cfstream.h', +- 'src/core/lib/iomgr/endpoint_pair.h', +- 'src/core/lib/iomgr/error.h', +- 'src/core/lib/iomgr/error_cfstream.h', +- 'src/core/lib/iomgr/error_internal.h', +- 'src/core/lib/iomgr/ev_epoll1_linux.h', +- 'src/core/lib/iomgr/ev_epollex_linux.h', +- 'src/core/lib/iomgr/ev_poll_posix.h', +- 'src/core/lib/iomgr/ev_posix.h', +- 'src/core/lib/iomgr/exec_ctx.h', +- 'src/core/lib/iomgr/executor.h', +- 'src/core/lib/iomgr/executor/mpmcqueue.h', +- 'src/core/lib/iomgr/executor/threadpool.h', +- 'src/core/lib/iomgr/gethostname.h', +- 'src/core/lib/iomgr/grpc_if_nametoindex.h', +- 'src/core/lib/iomgr/internal_errqueue.h', +- 'src/core/lib/iomgr/iocp_windows.h', +- 'src/core/lib/iomgr/iomgr.h', +- 'src/core/lib/iomgr/iomgr_custom.h', +- 'src/core/lib/iomgr/iomgr_internal.h', +- 'src/core/lib/iomgr/iomgr_posix.h', +- 'src/core/lib/iomgr/is_epollexclusive_available.h', +- 'src/core/lib/iomgr/load_file.h', +- 'src/core/lib/iomgr/lockfree_event.h', +- 'src/core/lib/iomgr/logical_thread.h', +- 'src/core/lib/iomgr/nameser.h', +- 'src/core/lib/iomgr/polling_entity.h', +- 'src/core/lib/iomgr/pollset.h', +- 'src/core/lib/iomgr/pollset_custom.h', +- 'src/core/lib/iomgr/pollset_set.h', +- 'src/core/lib/iomgr/pollset_set_custom.h', +- 'src/core/lib/iomgr/pollset_set_windows.h', +- 'src/core/lib/iomgr/pollset_windows.h', +- 'src/core/lib/iomgr/port.h', +- 'src/core/lib/iomgr/resolve_address.h', +- 'src/core/lib/iomgr/resolve_address_custom.h', +- 'src/core/lib/iomgr/resource_quota.h', +- 'src/core/lib/iomgr/sockaddr.h', +- 'src/core/lib/iomgr/sockaddr_custom.h', +- 'src/core/lib/iomgr/sockaddr_posix.h', +- 'src/core/lib/iomgr/sockaddr_utils.h', +- 'src/core/lib/iomgr/sockaddr_windows.h', +- 'src/core/lib/iomgr/socket_factory_posix.h', +- 'src/core/lib/iomgr/socket_mutator.h', +- 'src/core/lib/iomgr/socket_utils.h', +- 'src/core/lib/iomgr/socket_utils_posix.h', +- 'src/core/lib/iomgr/socket_windows.h', +- 'src/core/lib/iomgr/sys_epoll_wrapper.h', +- 'src/core/lib/iomgr/tcp_client.h', +- 'src/core/lib/iomgr/tcp_client_posix.h', +- 'src/core/lib/iomgr/tcp_custom.h', +- 'src/core/lib/iomgr/tcp_posix.h', +- 'src/core/lib/iomgr/tcp_server.h', +- 'src/core/lib/iomgr/tcp_server_utils_posix.h', +- 'src/core/lib/iomgr/tcp_windows.h', +- 'src/core/lib/iomgr/time_averaged_stats.h', +- 'src/core/lib/iomgr/timer.h', +- 'src/core/lib/iomgr/timer_custom.h', +- 'src/core/lib/iomgr/timer_heap.h', +- 'src/core/lib/iomgr/timer_manager.h', +- 'src/core/lib/iomgr/udp_server.h', +- 'src/core/lib/iomgr/unix_sockets_posix.h', +- 'src/core/lib/iomgr/wakeup_fd_pipe.h', +- 'src/core/lib/iomgr/wakeup_fd_posix.h', +- 'src/core/lib/json/json.h', +- 'src/core/lib/json/json_common.h', +- 'src/core/lib/json/json_reader.h', +- 'src/core/lib/json/json_writer.h', +- 'src/core/lib/profiling/timers.h', +- 'src/core/lib/slice/b64.h', +- 'src/core/lib/slice/percent_encoding.h', +- 'src/core/lib/slice/slice_hash_table.h', +- 'src/core/lib/slice/slice_internal.h', +- 'src/core/lib/slice/slice_string_helpers.h', +- 'src/core/lib/slice/slice_utils.h', +- 'src/core/lib/slice/slice_weak_hash_table.h', +- 'src/core/lib/surface/api_trace.h', +- 'src/core/lib/surface/call.h', +- 'src/core/lib/surface/call_test_only.h', +- 'src/core/lib/surface/channel.h', +- 'src/core/lib/surface/channel_init.h', +- 'src/core/lib/surface/channel_stack_type.h', +- 'src/core/lib/surface/completion_queue.h', +- 'src/core/lib/surface/completion_queue_factory.h', +- 'src/core/lib/surface/event_string.h', +- 'src/core/lib/surface/init.h', +- 'src/core/lib/surface/lame_client.h', +- 'src/core/lib/surface/server.h', +- 'src/core/lib/surface/validate_metadata.h', +- 'src/core/lib/transport/bdp_estimator.h', +- 'src/core/lib/transport/byte_stream.h', +- 'src/core/lib/transport/connectivity_state.h', +- 'src/core/lib/transport/error_utils.h', +- 'src/core/lib/transport/http2_errors.h', +- 'src/core/lib/transport/metadata.h', +- 'src/core/lib/transport/metadata_batch.h', +- 'src/core/lib/transport/pid_controller.h', +- 'src/core/lib/transport/static_metadata.h', +- 'src/core/lib/transport/status_conversion.h', +- 'src/core/lib/transport/status_metadata.h', +- 'src/core/lib/transport/timeout_encoding.h', +- 'src/core/lib/transport/transport.h', +- 'src/core/lib/transport/transport_impl.h', +- 'src/core/lib/uri/uri_parser.h', +- 'src/cpp/client/create_channel_internal.h', +- 'src/cpp/client/secure_credentials.h', +- 'src/cpp/common/channel_filter.h', +- 'src/cpp/common/secure_auth_context.h', +- 'src/cpp/common/tls_credentials_options_util.h', +- 'src/cpp/server/dynamic_thread_pool.h', +- 'src/cpp/server/external_connection_acceptor_impl.h', +- 'src/cpp/server/health/default_health_check_service.h', +- 'src/cpp/server/secure_server_credentials.h', +- 'src/cpp/server/thread_pool_interface.h', +- 'src/cpp/thread_manager/thread_manager.h', + 'src/core/ext/filters/client_channel/backend_metric.h', + 'src/core/ext/filters/client_channel/backup_poller.h', + 'src/core/ext/filters/client_channel/client_channel.h', +@@ -1222,6 +994,17 @@ Pod::Spec.new do |s| + 'src/core/tsi/transport_security.h', + 'src/core/tsi/transport_security_grpc.h', + 'src/core/tsi/transport_security_interface.h', ++ 'src/cpp/client/create_channel_internal.h', ++ 'src/cpp/client/secure_credentials.h', ++ 'src/cpp/common/channel_filter.h', ++ 'src/cpp/common/secure_auth_context.h', ++ 'src/cpp/common/tls_credentials_options_util.h', ++ 'src/cpp/server/dynamic_thread_pool.h', ++ 'src/cpp/server/external_connection_acceptor_impl.h', ++ 'src/cpp/server/health/default_health_check_service.h', ++ 'src/cpp/server/secure_server_credentials.h', ++ 'src/cpp/server/thread_pool_interface.h', ++ 'src/cpp/thread_manager/thread_manager.h', + 'third_party/upb/upb/decode.h', + 'third_party/upb/upb/encode.h', + 'third_party/upb/upb/generated_util.h', +@@ -1237,7 +1020,6 @@ Pod::Spec.new do |s| + ss.dependency "#{s.name}/Interface", version + + ss.source_files = 'include/grpcpp/impl/codegen/config_protobuf.h', +- 'include/grpcpp/impl/codegen/config_protobuf.h', + 'include/grpcpp/impl/codegen/proto_buffer_reader.h', + 'include/grpcpp/impl/codegen/proto_buffer_writer.h', + 'include/grpcpp/impl/codegen/proto_utils.h' +diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec +index 5b306628b20..ec4a29465de 100644 +--- a/gRPC-Core.podspec ++++ b/gRPC-Core.podspec +@@ -19,7 +19,6 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +- + Pod::Spec.new do |s| + s.name = 'gRPC-Core' + version = '1.26.0' +@@ -97,7 +96,7 @@ Pod::Spec.new do |s| + } + + s.default_subspecs = 'Interface', 'Implementation' +- s.compiler_flags = '-DGRPC_ARES=0' ++ s.compiler_flags = '-DGRPC_ARES=0 -Wno-comma' + s.libraries = 'c++' + + # Like many other C libraries, gRPC-Core has its public headers under `include//` and its +@@ -123,40 +122,26 @@ Pod::Spec.new do |s| + 'include/grpc/grpc_security.h', + 'include/grpc/grpc_security_constants.h', + 'include/grpc/impl/codegen/atm.h', +- 'include/grpc/impl/codegen/atm.h', + 'include/grpc/impl/codegen/atm_gcc_atomic.h', +- 'include/grpc/impl/codegen/atm_gcc_atomic.h', +- 'include/grpc/impl/codegen/atm_gcc_sync.h', + 'include/grpc/impl/codegen/atm_gcc_sync.h', + 'include/grpc/impl/codegen/atm_windows.h', +- 'include/grpc/impl/codegen/atm_windows.h', + 'include/grpc/impl/codegen/byte_buffer.h', + 'include/grpc/impl/codegen/byte_buffer_reader.h', + 'include/grpc/impl/codegen/compression_types.h', + 'include/grpc/impl/codegen/connectivity_state.h', + 'include/grpc/impl/codegen/fork.h', +- 'include/grpc/impl/codegen/fork.h', +- 'include/grpc/impl/codegen/gpr_slice.h', + 'include/grpc/impl/codegen/gpr_slice.h', + 'include/grpc/impl/codegen/gpr_types.h', +- 'include/grpc/impl/codegen/gpr_types.h', + 'include/grpc/impl/codegen/grpc_types.h', + 'include/grpc/impl/codegen/log.h', +- 'include/grpc/impl/codegen/log.h', +- 'include/grpc/impl/codegen/port_platform.h', + 'include/grpc/impl/codegen/port_platform.h', + 'include/grpc/impl/codegen/propagation_bits.h', + 'include/grpc/impl/codegen/slice.h', + 'include/grpc/impl/codegen/status.h', + 'include/grpc/impl/codegen/sync.h', +- 'include/grpc/impl/codegen/sync.h', +- 'include/grpc/impl/codegen/sync_custom.h', + 'include/grpc/impl/codegen/sync_custom.h', + 'include/grpc/impl/codegen/sync_generic.h', +- 'include/grpc/impl/codegen/sync_generic.h', + 'include/grpc/impl/codegen/sync_posix.h', +- 'include/grpc/impl/codegen/sync_posix.h', +- 'include/grpc/impl/codegen/sync_windows.h', + 'include/grpc/impl/codegen/sync_windows.h', + 'include/grpc/load_reporting.h', + 'include/grpc/slice.h', +@@ -186,6 +171,7 @@ Pod::Spec.new do |s| + ss.libraries = 'z' + ss.dependency "#{s.name}/Interface", version + ss.dependency 'BoringSSL-GRPC', '0.0.5' ++ abseil_version = '0.20190808.1' + ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS' + + ss.source_files = 'src/core/ext/filters/census/grpc_context.cc', +@@ -969,7 +955,6 @@ Pod::Spec.new do |s| + 'third_party/upb/upb/table.int.h', + 'third_party/upb/upb/upb.c', + 'third_party/upb/upb/upb.h' +- + ss.private_header_files = 'src/core/ext/filters/client_channel/backend_metric.h', + 'src/core/ext/filters/client_channel/backup_poller.h', + 'src/core/ext/filters/client_channel/client_channel.h', +@@ -1372,54 +1357,15 @@ Pod::Spec.new do |s| + 'test/core/end2end/data/server1_key.cc', + 'test/core/end2end/data/ssl_test_data.h', + 'test/core/end2end/data/test_root_cert.cc', ++ 'test/core/end2end/end2end_test_utils.cc', ++ 'test/core/end2end/end2end_tests.cc', ++ 'test/core/end2end/end2end_tests.h', + 'test/core/end2end/fixtures/http_proxy_fixture.cc', + 'test/core/end2end/fixtures/http_proxy_fixture.h', + 'test/core/end2end/fixtures/local_util.cc', + 'test/core/end2end/fixtures/local_util.h', + 'test/core/end2end/fixtures/proxy.cc', + 'test/core/end2end/fixtures/proxy.h', +- 'test/core/iomgr/endpoint_tests.cc', +- 'test/core/iomgr/endpoint_tests.h', +- 'test/core/security/oauth2_utils.cc', +- 'test/core/security/oauth2_utils.h', +- 'test/core/util/cmdline.cc', +- 'test/core/util/cmdline.h', +- 'test/core/util/debugger_macros.cc', +- 'test/core/util/debugger_macros.h', +- 'test/core/util/fuzzer_util.cc', +- 'test/core/util/fuzzer_util.h', +- 'test/core/util/grpc_profiler.cc', +- 'test/core/util/grpc_profiler.h', +- 'test/core/util/histogram.cc', +- 'test/core/util/histogram.h', +- 'test/core/util/memory_counters.cc', +- 'test/core/util/memory_counters.h', +- 'test/core/util/mock_endpoint.cc', +- 'test/core/util/mock_endpoint.h', +- 'test/core/util/parse_hexstring.cc', +- 'test/core/util/parse_hexstring.h', +- 'test/core/util/passthru_endpoint.cc', +- 'test/core/util/passthru_endpoint.h', +- 'test/core/util/port.cc', +- 'test/core/util/port.h', +- 'test/core/util/port_isolated_runtime_environment.cc', +- 'test/core/util/port_server_client.cc', +- 'test/core/util/port_server_client.h', +- 'test/core/util/slice_splitter.cc', +- 'test/core/util/slice_splitter.h', +- 'test/core/util/subprocess.h', +- 'test/core/util/subprocess_windows.cc', +- 'test/core/util/test_config.cc', +- 'test/core/util/test_config.h', +- 'test/core/util/test_lb_policies.cc', +- 'test/core/util/test_lb_policies.h', +- 'test/core/util/tracer_util.cc', +- 'test/core/util/tracer_util.h', +- 'test/core/util/trickle_endpoint.cc', +- 'test/core/util/trickle_endpoint.h', +- 'test/core/end2end/end2end_test_utils.cc', +- 'test/core/end2end/end2end_tests.cc', +- 'test/core/end2end/end2end_tests.h', + 'test/core/end2end/tests/authority_not_supported.cc', + 'test/core/end2end/tests/bad_hostname.cc', + 'test/core/end2end/tests/bad_ping.cc', +@@ -1498,7 +1444,46 @@ Pod::Spec.new do |s| + 'test/core/end2end/tests/trailing_metadata.cc', + 'test/core/end2end/tests/workaround_cronet_compression.cc', + 'test/core/end2end/tests/write_buffering.cc', +- 'test/core/end2end/tests/write_buffering_at_end.cc' ++ 'test/core/end2end/tests/write_buffering_at_end.cc', ++ 'test/core/iomgr/endpoint_tests.cc', ++ 'test/core/iomgr/endpoint_tests.h', ++ 'test/core/security/oauth2_utils.cc', ++ 'test/core/security/oauth2_utils.h', ++ 'test/core/util/cmdline.cc', ++ 'test/core/util/cmdline.h', ++ 'test/core/util/debugger_macros.cc', ++ 'test/core/util/debugger_macros.h', ++ 'test/core/util/fuzzer_util.cc', ++ 'test/core/util/fuzzer_util.h', ++ 'test/core/util/grpc_profiler.cc', ++ 'test/core/util/grpc_profiler.h', ++ 'test/core/util/histogram.cc', ++ 'test/core/util/histogram.h', ++ 'test/core/util/memory_counters.cc', ++ 'test/core/util/memory_counters.h', ++ 'test/core/util/mock_endpoint.cc', ++ 'test/core/util/mock_endpoint.h', ++ 'test/core/util/parse_hexstring.cc', ++ 'test/core/util/parse_hexstring.h', ++ 'test/core/util/passthru_endpoint.cc', ++ 'test/core/util/passthru_endpoint.h', ++ 'test/core/util/port.cc', ++ 'test/core/util/port.h', ++ 'test/core/util/port_isolated_runtime_environment.cc', ++ 'test/core/util/port_server_client.cc', ++ 'test/core/util/port_server_client.h', ++ 'test/core/util/slice_splitter.cc', ++ 'test/core/util/slice_splitter.h', ++ 'test/core/util/subprocess.h', ++ 'test/core/util/subprocess_windows.cc', ++ 'test/core/util/test_config.cc', ++ 'test/core/util/test_config.h', ++ 'test/core/util/test_lb_policies.cc', ++ 'test/core/util/test_lb_policies.h', ++ 'test/core/util/tracer_util.cc', ++ 'test/core/util/tracer_util.h', ++ 'test/core/util/trickle_endpoint.cc', ++ 'test/core/util/trickle_endpoint.h' + end + + # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path? +diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template +index 0a31cc5066b..ef0801c6735 100644 +--- a/templates/gRPC-C++.podspec.template ++++ b/templates/gRPC-C++.podspec.template +@@ -20,108 +20,84 @@ + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. ++ <% ++ lib_maps = {lib.name: lib for lib in libs} ++ filegroup_maps = {filegroup.name: filegroup for filegroup in filegroups} + +- <%! +- def grpc_lib_files(libs, expect_libs, groups): ++ def ruby_multiline_list(files, indent): ++ return (',\n' + indent*' ').join('\'%s\'' % f for f in files) ++ ++ def is_absl_lib(target_name): ++ return target_name.startswith("absl/") ++ ++ def get_absl_spec_name(label): ++ # e.g. absl/apple:banana -> abseil/apple/banana ++ return "abseil/" + label[5:].replace(":", "/") ++ ++ def lib_and_transitive_deps(lib): ++ return list(sorted(set({lib} | lib_maps[lib].transitive_deps))) ++ ++ def non_abseil_lib_and_transitive_deps(lib): ++ return [l for l in lib_and_transitive_deps(lib) if not is_absl_lib(l)] ++ ++ def list_abseil_specs(lib): ++ # This returns a list of abseil specs which the given lib and ++ # its non-abseil transitive dependencies depend on. ++ # As a result, internal abseil libraries are excluded from the result. ++ absl_specs = set() ++ for lib_name in lib_and_transitive_deps(lib): ++ if is_absl_lib(lib_name): continue ++ for dep in lib_maps[lib_name].deps: ++ if is_absl_lib(dep): ++ absl_specs.add(get_absl_spec_name(dep)) ++ return list(sorted(absl_specs)) ++ ++ def list_lib_files(lib, fields): ++ files = set() ++ for lib_name in non_abseil_lib_and_transitive_deps(lib): ++ lib = lib_maps[lib_name] ++ for field in fields: ++ files.update(lib.get(field, [])) ++ return list(sorted(files)) ++ ++ def list_filegroup_files(expect_filegroups, groups): + out = [] +- for lib in libs: +- if lib.name in expect_libs: +- for group in groups: +- out += lib.get(group, []) +- return sorted(out) ++ for filegroup_name in expect_filegroups: ++ filegroup = filegroup_maps[filegroup_name] ++ for group in groups: ++ out += filegroup.get(group, []) ++ return list(sorted(set(out))) + + def filter_grpcpp(files): +- return [file for file in files if not file.startswith("include/grpc++")] +- +- grpc_libs = ("grpc", "gpr", "upb") +- +- def grpc_private_files(libs): +- out = grpc_lib_files(libs, grpc_libs, ("headers", "src")) +- return out +- +- def grpc_private_headers(libs): +- out = grpc_lib_files(libs, grpc_libs, ("headers",)) +- return out +- +- def grpc_public_headers(libs): +- out = grpc_lib_files(libs, grpc_libs, ("public_headers",)) +- return out +- +- def grpcpp_proto_files(filegroups): +- out = grpc_lib_files(filegroups, ("grpc++_codegen_proto", "grpc++_config_proto"), ("headers", "src", "public_headers")) +- excl_files = grpc_lib_files(filegroups, ("grpc++_codegen_base",), ("headers", "src", "public_headers")) +- out = [file for file in out if file not in excl_files] +- out = filter_grpcpp(out) +- return out +- +- def grpcpp_private_files(libs, filegroups): +- out = grpc_lib_files(libs, ("grpc++",), ("headers", "src")) +- excl_files = grpc_private_files(libs) +- ++ return sorted([file for file in files if not file.startswith("include/grpc++")]) ++ ++ grpc_private_files = list_lib_files("grpc", ("headers", "src")) ++ grpc_public_headers = list_lib_files("grpc", ("public_headers",)) ++ grpc_private_headers = list_lib_files("grpc", ("headers",)) ++ ++ grpcpp_proto_files = filter_grpcpp( ++ set(list_filegroup_files(("grpc++_codegen_proto", "grpc++_config_proto"), ("headers", "src", "public_headers"))) ++ - set(list_filegroup_files(("grpc++_codegen_base",), ("headers", "src", "public_headers"))) ++ ) ++ grpcpp_private_files = filter_grpcpp( ++ set(list_lib_files("grpc++", ("headers", "src"))) ++ - set(grpc_private_files) + # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib +- excl_files += grpcpp_proto_files(filegroups) +- out = [file for file in out if file not in excl_files] +- +- out = filter_grpcpp(out) +- return out +- +- def grpcpp_private_headers(libs, filegroups): +- out = grpc_lib_files(libs, ("grpc++",), ("headers",)) +- excl_files = grpc_private_headers(libs) +- ++ - set(grpcpp_proto_files) ++ ) ++ grpcpp_private_headers = filter_grpcpp( ++ set(list_lib_files("grpc++", ("headers",))) ++ - set(grpc_private_headers) + # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib +- excl_files = grpcpp_proto_files(filegroups) +- out = [file for file in out if file not in excl_files] +- +- out = filter_grpcpp(out) +- return out +- +- def grpcpp_public_headers(libs, filegroups): +- out = grpc_lib_files(libs, ("grpc++",), ("public_headers",)) +- excl_files = grpc_public_headers(libs) +- ++ - set(grpcpp_proto_files) ++ ) ++ grpcpp_public_headers = filter_grpcpp( ++ set(list_lib_files("grpc++", ("public_headers",))) ++ - set(grpc_public_headers) + # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib +- excl_files += grpcpp_proto_files(filegroups) +- +- out = [file for file in out if file not in excl_files] +- +- out = filter_grpcpp(out) +- +- return out +- +- def grpc_test_util_files(libs): +- out = grpc_lib_files(libs, ("grpc_test_util",), ("src", "headers")) +- return out +- +- def grpc_test_util_headers(libs): +- out = grpc_lib_files(libs, ("grpc_test_util",), ("headers",)) +- return out +- +- # Tests subspec is currently disabled since the tests currently use `grpc++` include style instead of `grpcpp`. +- # TODO (mxyan): enable Tests subspec after the inclusion style is updated in `test/` directory. +- def grpcpp_test_util_files(libs, filegroups): +- out = grpc_lib_files(libs, ("grpc++_test_util",), ("src", "headers")) +- excl_files = grpc_test_util_files(libs) + grpcpp_private_files(libs, filegroups) +- +- # We exclude proto related files in this particular podspec so that we can provide a protobuf-independent lib +- excl_files += grpc_lib_files(filegroups, ("grpc++_codegen_proto", "grpc++_config_proto"), ("headers", "src")) +- excl_files += ["test/cpp/util/byte_buffer_proto_helper.cc", +- "test/cpp/util/byte_buffer_proto_helper.h", +- "test/cpp/end2end/test_service_impl.cc", +- "test/cpp/end2end/test_service_impl.h"] +- excl_files += [file for file in out if file.endswith(".proto")] +- +- out = [file for file in out if not file in excl_files] +- +- # Since some C++ test files directly included private headers in C core, we intentionally add these header +- # files to this subspec +- out += grpc_test_util_headers(libs) +- +- return out +- +- def ruby_multiline_list(files, indent): +- return (',\n' + indent*' ').join('\'%s\'' % f for f in files) +- ++ - set(grpcpp_proto_files) ++ ) ++ grpcpp_abseil_specs = list_abseil_specs("grpc++") + %> + Pod::Spec.new do |s| + s.name = 'gRPC-C++' +@@ -168,6 +144,7 @@ + } + + s.libraries = 'c++' ++ s.compiler_flags = '-Wno-comma' + + s.default_subspecs = 'Interface', 'Implementation' + +@@ -179,24 +156,28 @@ + s.subspec 'Interface' do |ss| + ss.header_mappings_dir = 'include/grpcpp' + +- ss.source_files = ${ruby_multiline_list(grpcpp_public_headers(libs, filegroups), 22)} ++ ss.source_files = ${ruby_multiline_list(grpcpp_public_headers, 22)} + end + + s.subspec 'Implementation' do |ss| + ss.header_mappings_dir = '.' + ss.dependency "#{s.name}/Interface", version + ss.dependency 'gRPC-Core', version ++ abseil_version = '0.20190808.1' ++ % for abseil_spec in grpcpp_abseil_specs: ++ ss.dependency '${abseil_spec}', abseil_version ++ % endfor + +- ss.source_files = ${ruby_multiline_list(grpcpp_private_files(libs, filegroups) + grpc_private_headers(libs), 22)} ++ ss.source_files = ${ruby_multiline_list(sorted(grpcpp_private_files + grpc_private_headers), 22)} + +- ss.private_header_files = ${ruby_multiline_list(grpcpp_private_headers(libs, filegroups) + grpc_private_headers(libs), 30)} ++ ss.private_header_files = ${ruby_multiline_list(sorted(grpcpp_private_headers + grpc_private_headers), 30)} + end + + s.subspec 'Protobuf' do |ss| + ss.header_mappings_dir = 'include/grpcpp' + ss.dependency "#{s.name}/Interface", version + +- ss.source_files = ${ruby_multiline_list(grpcpp_proto_files(filegroups), 22)} ++ ss.source_files = ${ruby_multiline_list(grpcpp_proto_files, 22)} + end + + s.subspec 'Cronet-Interface' do |ss| +diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template +index 9bebbdf4097..847aabc41d7 100644 +--- a/templates/gRPC-Core.podspec.template ++++ b/templates/gRPC-Core.podspec.template +@@ -20,60 +20,70 @@ + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +- +- <%! +- def grpc_lib_files(libs, expect_libs, groups): +- out = [] +- for lib in libs: +- if lib.name in expect_libs: +- for group in groups: +- out += lib.get(group, []) +- return sorted(out) +- +- grpc_libs = ("grpc", "gpr", "upb") +- +- def grpc_private_files(libs): +- out = grpc_lib_files(libs, grpc_libs, ("headers", "src")) +- return out +- +- def grpc_public_headers(libs): +- out = grpc_lib_files(libs, grpc_libs, ("public_headers",)) +- return out +- +- def grpc_private_headers(libs): +- out = grpc_lib_files(libs, grpc_libs, ("headers",)) +- return out +- +- def grpc_cronet_files(libs): +- out = grpc_lib_files(libs, ("grpc_cronet",), ("src", "headers")) +- excl = grpc_private_files(libs) +- excl += [ +- # We do not need cronet dedicated plugin registry +- "src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc", +- # We do not need dummy cronet API for ObjC +- "src/core/ext/transport/cronet/transport/cronet_api_dummy.cc", +- ] +- return [file for file in out if not file in excl] +- +- def grpc_cronet_public_headers(libs): +- out = grpc_lib_files(libs, ("grpc_cronet",), ("public_headers",)) +- excl = grpc_public_headers(libs) +- return [file for file in out if not file in excl] +- +- def grpc_test_util_files(libs): +- out = grpc_lib_files(libs, ("grpc_test_util",), ("src", "headers")) +- excl = grpc_private_files(libs) +- # Subprocess is not supported in tvOS and not needed by our tests. +- excl += ["test/core/util/subprocess_posix.cc"] +- return [file for file in out if not file in excl] +- +- def end2end_tests_files(libs): +- out = grpc_lib_files(libs, ("end2end_tests",), ("src", "headers")) +- excl = grpc_private_files(libs) +- return [file for file in out if not file in excl] ++ <% ++ lib_maps = {lib.name: lib for lib in libs} + + def ruby_multiline_list(files, indent): + return (',\n' + indent*' ').join('\'%s\'' % f for f in files) ++ ++ def is_absl_lib(target_name): ++ return target_name.startswith("absl/") ++ ++ def get_absl_spec_name(label): ++ # e.g. absl/apple:banana -> abseil/apple/banana ++ return "abseil/" + label[5:].replace(":", "/") ++ ++ def lib_and_transitive_deps(lib): ++ return list(sorted(set({lib} | lib_maps[lib].transitive_deps))) ++ ++ def non_abseil_lib_and_transitive_deps(lib): ++ return [l for l in lib_and_transitive_deps(lib) if not is_absl_lib(l)] ++ ++ def list_abseil_specs(lib): ++ # This returns a list of abseil specs which the given lib and ++ # its non-abseil transitive dependencies depend on. ++ # As a result, internal abseil libraries are excluded from the result. ++ absl_specs = set() ++ for lib_name in lib_and_transitive_deps(lib): ++ if is_absl_lib(lib_name): continue ++ for dep in lib_maps[lib_name].deps: ++ if is_absl_lib(dep): ++ absl_specs.add(get_absl_spec_name(dep)) ++ return list(sorted(absl_specs)) ++ ++ def list_lib_files(lib, fields): ++ files = set() ++ for lib_name in non_abseil_lib_and_transitive_deps(lib): ++ lib = lib_maps[lib_name] ++ for field in fields: ++ files.update(lib.get(field, [])) ++ return list(sorted(files)) ++ ++ grpc_private_files = list_lib_files("grpc", ("headers", "src")) ++ grpc_public_headers = list_lib_files("grpc", ("public_headers",)) ++ grpc_private_headers = list_lib_files("grpc", ("headers",)) ++ grpc_abseil_specs = list_abseil_specs("grpc") ++ ++ grpc_cronet_files = list(sorted( ++ set(list_lib_files("grpc_cronet", ("src", "headers"))) ++ - set(grpc_private_files) ++ - set([ ++ # We do not need cronet dedicated plugin registry ++ "src/core/ext/transport/cronet/plugin_registry/grpc_cronet_plugin_registry.cc", ++ # We do not need dummy cronet API for ObjC ++ "src/core/ext/transport/cronet/transport/cronet_api_dummy.cc", ++ ]))) ++ grpc_cronet_public_headers = list(sorted( ++ set(list_lib_files("grpc_cronet", ("public_headers",))) ++ - set(grpc_public_headers))) ++ ++ grpc_test_util_files = list(sorted( ++ set(list_lib_files("end2end_tests", ("src", "headers"))) ++ - set(grpc_private_files) ++ - set([ ++ # Subprocess is not supported in tvOS and not needed by our tests. ++ "test/core/util/subprocess_posix.cc", ++ ]))) + %> + Pod::Spec.new do |s| + s.name = 'gRPC-Core' +@@ -152,7 +162,7 @@ + } + + s.default_subspecs = 'Interface', 'Implementation' +- s.compiler_flags = '-DGRPC_ARES=0' ++ s.compiler_flags = '-DGRPC_ARES=0 -Wno-comma' + s.libraries = 'c++' + + # Like many other C libraries, gRPC-Core has its public headers under `include//` and its +@@ -168,18 +178,21 @@ + s.subspec 'Interface' do |ss| + ss.header_mappings_dir = 'include/grpc' + +- ss.source_files = ${ruby_multiline_list(grpc_public_headers(libs), 22)} ++ ss.source_files = ${ruby_multiline_list(grpc_public_headers, 22)} + end + s.subspec 'Implementation' do |ss| + ss.header_mappings_dir = '.' + ss.libraries = 'z' + ss.dependency "#{s.name}/Interface", version + ss.dependency 'BoringSSL-GRPC', '0.0.5' ++ abseil_version = '0.20190808.1' ++ % for abseil_spec in grpc_abseil_specs: ++ ss.dependency '${abseil_spec}', abseil_version ++ % endfor + ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS' + +- ss.source_files = ${ruby_multiline_list(grpc_private_files(libs), 22)} +- +- ss.private_header_files = ${ruby_multiline_list(grpc_private_headers(libs), 30)} ++ ss.source_files = ${ruby_multiline_list(grpc_private_files, 22)} ++ ss.private_header_files = ${ruby_multiline_list(grpc_private_headers, 30)} + end + + # CFStream is now default. Leaving this subspec only for compatibility purpose. +@@ -189,7 +202,7 @@ + + s.subspec 'Cronet-Interface' do |ss| + ss.header_mappings_dir = 'include/grpc' +- ss.source_files = ${ruby_multiline_list(grpc_cronet_public_headers(libs), 22)} ++ ss.source_files = ${ruby_multiline_list(grpc_cronet_public_headers, 22)} + end + + s.subspec 'Cronet-Implementation' do |ss| +@@ -199,7 +212,7 @@ + ss.dependency "#{s.name}/Implementation", version + ss.dependency "#{s.name}/Cronet-Interface", version + +- ss.source_files = ${ruby_multiline_list(grpc_cronet_files(libs), 22)} ++ ss.source_files = ${ruby_multiline_list(grpc_cronet_files, 22)} + end + + s.subspec 'Tests' do |ss| +@@ -208,8 +221,7 @@ + ss.dependency "#{s.name}/Interface", version + ss.dependency "#{s.name}/Implementation", version + +- ss.source_files = ${ruby_multiline_list(grpc_test_util_files(libs), 22)}, +- ${ruby_multiline_list(end2end_tests_files(libs), 22)} ++ ss.source_files = ${ruby_multiline_list(grpc_test_util_files, 22)} + end + + # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path? diff --git a/SOURCES/README.md b/SOURCES/README.md new file mode 100644 index 0000000..7955d69 --- /dev/null +++ b/SOURCES/README.md @@ -0,0 +1,3 @@ +# grpc + +The grpc package \ No newline at end of file diff --git a/SOURCES/grpc-0001-enforce-system-crypto-policies.patch b/SOURCES/grpc-0001-enforce-system-crypto-policies.patch new file mode 100644 index 0000000..14add7d --- /dev/null +++ b/SOURCES/grpc-0001-enforce-system-crypto-policies.patch @@ -0,0 +1,41 @@ +From 5d56d52e0829e503e403568de66bb6cebfec3202 Mon Sep 17 00:00:00 2001 +From: Sergey Avseyev +Date: Wed, 28 Nov 2018 18:53:22 +0300 +Subject: [PATCH 1/4] enforce system crypto policies + +--- + test/core/handshake/client_ssl.cc | 3 +-- + test/core/handshake/server_ssl_common.cc | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc +index 467df6e229..b31934e51b 100644 +--- a/test/core/handshake/client_ssl.cc ++++ b/test/core/handshake/client_ssl.cc +@@ -161,8 +161,7 @@ static void server_thread(void* arg) { + // Set the cipher list to match the one expressed in + // src/core/tsi/ssl_transport_security.c. + const char* cipher_list = +- "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-" +- "SHA384:ECDHE-RSA-AES256-GCM-SHA384"; ++ "PROFILE=SYSTEM"; + if (!SSL_CTX_set_cipher_list(ctx, cipher_list)) { + ERR_print_errors_fp(stderr); + gpr_log(GPR_ERROR, "Couldn't set server cipher list."); +diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc +index 41b2829d8b..8b21ea7c73 100644 +--- a/test/core/handshake/server_ssl_common.cc ++++ b/test/core/handshake/server_ssl_common.cc +@@ -167,8 +167,7 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, + // Set the cipher list to match the one expressed in + // src/core/tsi/ssl_transport_security.c. + const char* cipher_list = +- "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-" +- "SHA384:ECDHE-RSA-AES256-GCM-SHA384"; ++ "PROFILE=SYSTEM"; + if (!SSL_CTX_set_cipher_list(ctx, cipher_list)) { + ERR_print_errors_fp(stderr); + gpr_log(GPR_ERROR, "Couldn't set server cipher list."); +-- +2.21.0 + diff --git a/SOURCES/grpc-1.26.0-core-tests-link-errors.patch b/SOURCES/grpc-1.26.0-core-tests-link-errors.patch new file mode 100644 index 0000000..48e6521 --- /dev/null +++ b/SOURCES/grpc-1.26.0-core-tests-link-errors.patch @@ -0,0 +1,11 @@ +diff -Naur grpc-1.26.0-original/CMakeLists.txt grpc-1.26.0/CMakeLists.txt +--- grpc-1.26.0-original/CMakeLists.txt 2019-12-17 20:29:27.000000000 -0500 ++++ grpc-1.26.0/CMakeLists.txt 2021-03-15 09:17:35.873493405 -0400 +@@ -2609,6 +2609,7 @@ + ${_gRPC_ALLTARGETS_LIBRARIES} + gpr + grpc_unsecure ++ grpc + upb + ) + if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) diff --git a/SOURCES/grpc-1.26.0-grpcio-tests-conditionalize-enum34.patch b/SOURCES/grpc-1.26.0-grpcio-tests-conditionalize-enum34.patch new file mode 100644 index 0000000..2a90d4f --- /dev/null +++ b/SOURCES/grpc-1.26.0-grpcio-tests-conditionalize-enum34.patch @@ -0,0 +1,21 @@ +diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/setup.py grpc-1.26.0/src/python/grpcio_tests/setup.py +--- grpc-1.26.0-original/src/python/grpcio_tests/setup.py 2019-12-17 20:29:27.000000000 -0500 ++++ grpc-1.26.0/src/python/grpcio_tests/setup.py 2021-02-02 09:11:20.236194502 -0500 +@@ -37,7 +37,7 @@ + } + + INSTALL_REQUIRES = ( +- 'coverage>=4.0', 'enum34>=1.0.4', ++ 'coverage>=4.0', + 'grpcio>={version}'.format(version=grpc_version.VERSION), + 'grpcio-channelz>={version}'.format(version=grpc_version.VERSION), + 'grpcio-status>={version}'.format(version=grpc_version.VERSION), +@@ -48,6 +48,8 @@ + + if not PY3: + INSTALL_REQUIRES += ('futures>=2.2.0',) ++if sys.version_info < (3, 4): ++ INSTALL_REQUIRES += ('enum34>=1.0.4',) + + COMMAND_CLASS = { + # Run `preprocess` *before* doing any packaging! diff --git a/SOURCES/grpc-1.26.0-grpcio_tests-make-network-tests-skippable.patch b/SOURCES/grpc-1.26.0-grpcio_tests-make-network-tests-skippable.patch new file mode 100644 index 0000000..a9307dd --- /dev/null +++ b/SOURCES/grpc-1.26.0-grpcio_tests-make-network-tests-skippable.patch @@ -0,0 +1,40 @@ +diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py grpc-1.26.0/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py +--- grpc-1.26.0-original/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py 2019-12-17 20:29:27.000000000 -0500 ++++ grpc-1.26.0/src/python/grpcio_tests/tests/interop/_secure_intraop_test.py 2021-03-15 10:09:54.802317262 -0400 +@@ -13,6 +13,7 @@ + # limitations under the License. + """Secure client-server interoperability as a unit test.""" + ++import os + import unittest + + import grpc +@@ -29,6 +30,8 @@ + class SecureIntraopTest(_intraop_test_case.IntraopTestCase, unittest.TestCase): + + def setUp(self): ++ if 'FEDORA_NO_NETWORK_TESTS' in os.environ: ++ self.skipTest('Network tests disabled') + self.server = test_common.test_server() + test_pb2_grpc.add_TestServiceServicer_to_server(service.TestService(), + self.server) +diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py grpc-1.26.0/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py +--- grpc-1.26.0-original/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py 2019-12-17 20:29:27.000000000 -0500 ++++ grpc-1.26.0/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py 2021-03-15 10:08:08.159649736 -0400 +@@ -13,6 +13,7 @@ + # limitations under the License. + """Tests for an actual dns resolution.""" + ++import os + import unittest + import logging + import six +@@ -45,6 +46,8 @@ + def tearDown(self): + self._server.stop(None) + ++ @unittest.skipIf('FEDORA_NO_NETWORK_TESTS' in os.environ, ++ 'Network tests disabled') + def test_connect_loopback(self): + # NOTE(https://github.com/grpc/grpc/issues/18422) + # In short, Gevent + C-Ares = Segfault. The C-Ares driver is not diff --git a/SOURCES/grpc-1.26.0-python-SyntaxWarning.patch b/SOURCES/grpc-1.26.0-python-SyntaxWarning.patch new file mode 100644 index 0000000..1509310 --- /dev/null +++ b/SOURCES/grpc-1.26.0-python-SyntaxWarning.patch @@ -0,0 +1,14 @@ +Backport upstream commit 9e0b427893b65b220faf8a31a6afdc67f6f41364 “Use != with literals” + +diff -Naur grpc-1.26.0-original/src/python/grpcio/commands.py grpc-1.26.0/src/python/grpcio/commands.py +--- grpc-1.26.0-original/src/python/grpcio/commands.py 2019-12-17 20:29:27.000000000 -0500 ++++ grpc-1.26.0/src/python/grpcio/commands.py 2021-01-28 12:51:33.635142522 -0500 +@@ -99,7 +99,7 @@ + target_dir = os.path.join(GRPC_STEM, 'doc', 'build') + exit_code = sphinx.cmd.build.build_main( + ['-b', 'html', '-W', '--keep-going', source_dir, target_dir]) +- if exit_code is not 0: ++ if exit_code: + raise CommandError( + "Documentation generation has warnings or errors") + diff --git a/SOURCES/grpc-1.26.0-python-grpcio_tests-fixture-super.patch b/SOURCES/grpc-1.26.0-python-grpcio_tests-fixture-super.patch new file mode 100644 index 0000000..ed99b1c --- /dev/null +++ b/SOURCES/grpc-1.26.0-python-grpcio_tests-fixture-super.patch @@ -0,0 +1,23 @@ +diff -Naur grpc-1.26.0-original/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py grpc-1.26.0/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py +--- grpc-1.26.0-original/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py 2019-12-17 20:29:27.000000000 -0500 ++++ grpc-1.26.0/src/python/grpcio_tests/tests/health_check/_health_servicer_test.py 2021-03-15 09:15:08.419558680 -0400 +@@ -235,8 +235,7 @@ + + def setUp(self): + self._thread_pool = thread_pool.RecordingThreadPool(max_workers=None) +- super(HealthServicerTest, self).start_server( +- non_blocking=True, thread_pool=self._thread_pool) ++ super().start_server(non_blocking=True, thread_pool=self._thread_pool) + + def test_check_empty_service(self): + request = health_pb2.HealthCheckRequest() +@@ -273,8 +272,7 @@ + class HealthServicerBackwardsCompatibleWatchTest(BaseWatchTests.WatchTests): + + def setUp(self): +- super(HealthServicerBackwardsCompatibleWatchTest, self).start_server( +- non_blocking=False, thread_pool=None) ++ super().start_server(non_blocking=False, thread_pool=None) + + + if __name__ == '__main__': diff --git a/SOURCES/grpc-1.26.0-python-grpcio_tools-use-system-protobuf.patch b/SOURCES/grpc-1.26.0-python-grpcio_tools-use-system-protobuf.patch new file mode 100644 index 0000000..6b42770 --- /dev/null +++ b/SOURCES/grpc-1.26.0-python-grpcio_tools-use-system-protobuf.patch @@ -0,0 +1,18 @@ +diff -Naur grpc-1.26.0-original/tools/distrib/python/grpcio_tools/protoc_lib_deps.py grpc-1.26.0/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +--- grpc-1.26.0-original/tools/distrib/python/grpcio_tools/protoc_lib_deps.py 2019-12-17 20:29:27.000000000 -0500 ++++ grpc-1.26.0/tools/distrib/python/grpcio_tools/protoc_lib_deps.py 2021-01-29 09:37:57.182365074 -0500 +@@ -14,10 +14,9 @@ + # limitations under the License. + + # AUTO-GENERATED BY make_grpcio_tools.py! +-CC_FILES=['google/protobuf/compiler/zip_writer.cc', 'google/protobuf/compiler/subprocess.cc', 'google/protobuf/compiler/ruby/ruby_generator.cc', 'google/protobuf/compiler/python/python_generator.cc', 'google/protobuf/compiler/plugin.pb.cc', 'google/protobuf/compiler/plugin.cc', 'google/protobuf/compiler/php/php_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', 'google/protobuf/compiler/objectivec/objectivec_message.cc', 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', 'google/protobuf/compiler/objectivec/objectivec_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_file.cc', 'google/protobuf/compiler/objectivec/objectivec_field.cc', 'google/protobuf/compiler/objectivec/objectivec_extension.cc', 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', 'google/protobuf/compiler/objectivec/objectivec_enum.cc', 'google/protobuf/compiler/js/well_known_types_embed.cc', 'google/protobuf/compiler/js/js_generator.cc', 'google/protobuf/compiler/java/java_string_field_lite.cc', 'google/protobuf/compiler/java/java_string_field.cc', 'google/protobuf/compiler/java/java_shared_code_generator.cc', 'google/protobuf/compiler/java/java_service.cc', 'google/protobuf/compiler/java/java_primitive_field_lite.cc', 'google/protobuf/compiler/java/java_primitive_field.cc', 'google/protobuf/compiler/java/java_name_resolver.cc', 'google/protobuf/compiler/java/java_message_lite.cc', 'google/protobuf/compiler/java/java_message_field_lite.cc', 'google/protobuf/compiler/java/java_message_field.cc', 'google/protobuf/compiler/java/java_message_builder_lite.cc', 'google/protobuf/compiler/java/java_message_builder.cc', 'google/protobuf/compiler/java/java_message.cc', 'google/protobuf/compiler/java/java_map_field_lite.cc', 'google/protobuf/compiler/java/java_map_field.cc', 'google/protobuf/compiler/java/java_helpers.cc', 'google/protobuf/compiler/java/java_generator_factory.cc', 'google/protobuf/compiler/java/java_generator.cc', 'google/protobuf/compiler/java/java_file.cc', 'google/protobuf/compiler/java/java_field.cc', 'google/protobuf/compiler/java/java_extension_lite.cc', 'google/protobuf/compiler/java/java_extension.cc', 'google/protobuf/compiler/java/java_enum_lite.cc', 'google/protobuf/compiler/java/java_enum_field_lite.cc', 'google/protobuf/compiler/java/java_enum_field.cc', 'google/protobuf/compiler/java/java_enum.cc', 'google/protobuf/compiler/java/java_doc_comment.cc', 'google/protobuf/compiler/java/java_context.cc', 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_message_field.cc', 'google/protobuf/compiler/csharp/csharp_message.cc', 'google/protobuf/compiler/csharp/csharp_map_field.cc', 'google/protobuf/compiler/csharp/csharp_helpers.cc', 'google/protobuf/compiler/csharp/csharp_generator.cc', 'google/protobuf/compiler/csharp/csharp_field_base.cc', 'google/protobuf/compiler/csharp/csharp_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_enum.cc', 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', 'google/protobuf/compiler/cpp/cpp_string_field.cc', 'google/protobuf/compiler/cpp/cpp_service.cc', 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', 'google/protobuf/compiler/cpp/cpp_message_field.cc', 'google/protobuf/compiler/cpp/cpp_message.cc', 'google/protobuf/compiler/cpp/cpp_map_field.cc', 'google/protobuf/compiler/cpp/cpp_helpers.cc', 'google/protobuf/compiler/cpp/cpp_generator.cc', 'google/protobuf/compiler/cpp/cpp_file.cc', 'google/protobuf/compiler/cpp/cpp_field.cc', 'google/protobuf/compiler/cpp/cpp_extension.cc', 'google/protobuf/compiler/cpp/cpp_enum_field.cc', 'google/protobuf/compiler/cpp/cpp_enum.cc', 'google/protobuf/compiler/command_line_interface.cc', 'google/protobuf/compiler/code_generator.cc', 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', 'google/protobuf/util/type_resolver_util.cc', 'google/protobuf/util/time_util.cc', 'google/protobuf/util/message_differencer.cc', 'google/protobuf/util/json_util.cc', 'google/protobuf/util/internal/utility.cc', 'google/protobuf/util/internal/type_info_test_helper.cc', 'google/protobuf/util/internal/type_info.cc', 'google/protobuf/util/internal/protostream_objectwriter.cc', 'google/protobuf/util/internal/protostream_objectsource.cc', 'google/protobuf/util/internal/proto_writer.cc', 'google/protobuf/util/internal/object_writer.cc', 'google/protobuf/util/internal/json_stream_parser.cc', 'google/protobuf/util/internal/json_objectwriter.cc', 'google/protobuf/util/internal/json_escaping.cc', 'google/protobuf/util/internal/field_mask_utility.cc', 'google/protobuf/util/internal/error_listener.cc', 'google/protobuf/util/internal/default_value_objectwriter.cc', 'google/protobuf/util/internal/datapiece.cc', 'google/protobuf/util/field_mask_util.cc', 'google/protobuf/util/field_comparator.cc', 'google/protobuf/util/delimited_message_util.cc', 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', 'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc', 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', 'google/protobuf/io/zero_copy_stream_impl.cc', 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', 'google/protobuf/generated_message_table_driven.cc', 'google/protobuf/generated_message_reflection.cc', 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', 'google/protobuf/stubs/structurally_valid.cc', 'google/protobuf/stubs/stringprintf.cc', 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/int128.cc', 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', 'google/protobuf/repeated_field.cc', 'google/protobuf/parse_context.cc', 'google/protobuf/message_lite.cc', 'google/protobuf/io/zero_copy_stream_impl_lite.cc', 'google/protobuf/io/zero_copy_stream.cc', 'google/protobuf/io/strtod.cc', 'google/protobuf/io/io_win32.cc', 'google/protobuf/io/coded_stream.cc', 'google/protobuf/implicit_weak_message.cc', 'google/protobuf/generated_message_util.cc', 'google/protobuf/generated_message_table_driven_lite.cc', 'google/protobuf/extension_set.cc', 'google/protobuf/arena.cc', 'google/protobuf/any_lite.cc'] ++# Then, modified by hand to build with an external system protobuf installation. ++CC_FILES=[] + PROTO_FILES=['google/protobuf/wrappers.proto', 'google/protobuf/type.proto', 'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto', 'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto', 'google/protobuf/empty.proto', 'google/protobuf/duration.proto', 'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto', 'google/protobuf/api.proto', 'google/protobuf/any.proto'] + +-CC_INCLUDE='third_party/protobuf/src' +-PROTO_INCLUDE='third_party/protobuf/src' +- +-PROTOBUF_SUBMODULE_VERSION="09745575a923640154bcf307fba8aedff47f240a" ++CC_INCLUDE='/usr/include' ++PROTO_INCLUDE='/usr/include' diff --git a/SOURCES/grpc-1.36.0-python-grpcio_tests-skip-compression-tests.patch b/SOURCES/grpc-1.36.0-python-grpcio_tests-skip-compression-tests.patch new file mode 100644 index 0000000..08f1892 --- /dev/null +++ b/SOURCES/grpc-1.36.0-python-grpcio_tests-skip-compression-tests.patch @@ -0,0 +1,21 @@ +diff -Naur grpc-1.36.0-original/src/python/grpcio_tests/tests/unit/_compression_test.py grpc-1.36.0/src/python/grpcio_tests/tests/unit/_compression_test.py +--- grpc-1.36.0-original/src/python/grpcio_tests/tests/unit/_compression_test.py 2021-02-23 16:34:43.000000000 -0500 ++++ grpc-1.36.0/src/python/grpcio_tests/tests/unit/_compression_test.py 2021-03-03 09:41:03.076816980 -0500 +@@ -318,6 +318,7 @@ + else: + self.assertNotCompressed(received_ratio) + ++ @unittest.skip('Wrong compression ratio may occur; unknown cause') + def testDisableNextCompressionStreaming(self): + server_kwargs = { + 'compression': grpc.Compression.Deflate, +@@ -372,6 +373,9 @@ + def _test_compression(self): + self.assertConfigurationCompressed(**kwargs) + ++ _test_compression = unittest.skip( ++ 'Wrong compression ratio may occur; unknown cause' ++ )(_test_compression) + return _test_compression + + setattr(CompressionTest, _get_compression_test_name(**options), diff --git a/SOURCES/grpc-1.36.4-python-grpcio_tests-skip-compression-tests.patch b/SOURCES/grpc-1.36.4-python-grpcio_tests-skip-compression-tests.patch new file mode 100644 index 0000000..82b7cc5 --- /dev/null +++ b/SOURCES/grpc-1.36.4-python-grpcio_tests-skip-compression-tests.patch @@ -0,0 +1,21 @@ +diff -Naur grpc-1.36.4-original/src/python/grpcio_tests/tests/unit/_compression_test.py grpc-1.36.4/src/python/grpcio_tests/tests/unit/_compression_test.py +--- grpc-1.36.4-original/src/python/grpcio_tests/tests/unit/_compression_test.py 2021-03-17 15:59:05.000000000 -0400 ++++ grpc-1.36.4/src/python/grpcio_tests/tests/unit/_compression_test.py 2021-03-22 16:46:55.555358822 -0400 +@@ -318,6 +318,7 @@ + else: + self.assertNotCompressed(received_ratio) + ++ @unittest.skip('Wrong compression ratio may occur; unknown cause') + def testDisableNextCompressionStreaming(self): + server_kwargs = { + 'compression': grpc.Compression.Deflate, +@@ -372,6 +373,9 @@ + def _test_compression(self): + self.assertConfigurationCompressed(**kwargs) + ++ _test_compression = unittest.skip( ++ 'Wrong compression ratio may occur; unknown cause' ++ )(_test_compression) + return _test_compression + + setattr(CompressionTest, _get_compression_test_name(**options), diff --git a/SOURCES/grpc-1.39.0-python_wrapper-path.patch b/SOURCES/grpc-1.39.0-python_wrapper-path.patch new file mode 100644 index 0000000..5b7a227 --- /dev/null +++ b/SOURCES/grpc-1.39.0-python_wrapper-path.patch @@ -0,0 +1,30 @@ +diff -Naur grpc-1.39.0-original/test/core/http/httpcli_test.cc grpc-1.39.0/test/core/http/httpcli_test.cc +--- grpc-1.39.0-original/test/core/http/httpcli_test.cc 2021-07-20 18:39:39.000000000 -0400 ++++ grpc-1.39.0/test/core/http/httpcli_test.cc 2021-08-02 11:38:43.215629892 -0400 +@@ -165,9 +165,9 @@ + lslash = me + (lslash - me) - sizeof("http"); + } + root = static_cast( +- gpr_malloc(static_cast(lslash - me + sizeof("/../..")))); ++ gpr_malloc(static_cast(lslash - me + sizeof("/..")))); + memcpy(root, me, static_cast(lslash - me)); +- memcpy(root + (lslash - me), "/../..", sizeof("/../..")); ++ memcpy(root + (lslash - me), "/..", sizeof("/..")); + } else { + root = gpr_strdup("."); + } +diff -Naur grpc-1.39.0-original/test/core/http/httpscli_test.cc grpc-1.39.0/test/core/http/httpscli_test.cc +--- grpc-1.39.0-original/test/core/http/httpscli_test.cc 2021-07-20 18:39:39.000000000 -0400 ++++ grpc-1.39.0/test/core/http/httpscli_test.cc 2021-08-02 11:38:52.825572125 -0400 +@@ -166,9 +166,9 @@ + lslash = me + (lslash - me) - sizeof("http"); + } + root = static_cast( +- gpr_malloc(static_cast(lslash - me + sizeof("/../..")))); ++ gpr_malloc(static_cast(lslash - me + sizeof("/..")))); + memcpy(root, me, static_cast(lslash - me)); +- memcpy(root + (lslash - me), "/../..", sizeof("/../..")); ++ memcpy(root + (lslash - me), "/..", sizeof("/..")); + } else { + root = gpr_strdup("."); + } diff --git a/SOURCES/grpc-1.40.0-google-benchmark-1.6.0.patch b/SOURCES/grpc-1.40.0-google-benchmark-1.6.0.patch new file mode 100644 index 0000000..14f5d98 --- /dev/null +++ b/SOURCES/grpc-1.40.0-google-benchmark-1.6.0.patch @@ -0,0 +1,55 @@ +From 67cba751363d35fcf88aae7f82616d560d7403fa Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Tue, 14 Sep 2021 15:00:41 -0400 +Subject: [PATCH] Adapt to google-benchmark 1.6.0 + +State::thread_index and State::threads are now accessor methods instead +of data members. +--- + test/cpp/microbenchmarks/bm_cq_multiple_threads.cc | 2 +- + test/cpp/microbenchmarks/bm_threadpool.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +index d57a021cee..f9cdd67809 100644 +--- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc ++++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +@@ -160,7 +160,7 @@ static void teardown() { + */ + static void BM_Cq_Throughput(benchmark::State& state) { + gpr_timespec deadline = gpr_inf_future(GPR_CLOCK_MONOTONIC); +- auto thd_idx = state.thread_index; ++ auto thd_idx = state.thread_index(); + + gpr_mu_lock(&g_mu); + g_threads_active++; +diff --git a/test/cpp/microbenchmarks/bm_threadpool.cc b/test/cpp/microbenchmarks/bm_threadpool.cc +index b06deeeb37..cedad52ed2 100644 +--- a/test/cpp/microbenchmarks/bm_threadpool.cc ++++ b/test/cpp/microbenchmarks/bm_threadpool.cc +@@ -152,11 +152,11 @@ class SuicideFunctorForAdd : public grpc_completion_queue_functor { + static void BM_ThreadPoolExternalAdd(benchmark::State& state) { + static grpc_core::ThreadPool* external_add_pool = nullptr; + // Setup for each run of test. +- if (state.thread_index == 0) { ++ if (state.thread_index() == 0) { + const int num_threads = state.range(1); + external_add_pool = new grpc_core::ThreadPool(num_threads); + } +- const int num_iterations = state.range(0) / state.threads; ++ const int num_iterations = state.range(0) / state.threads(); + while (state.KeepRunningBatch(num_iterations)) { + BlockingCounter counter(num_iterations); + for (int i = 0; i < num_iterations; ++i) { +@@ -166,7 +166,7 @@ static void BM_ThreadPoolExternalAdd(benchmark::State& state) { + } + + // Teardown at the end of each test run. +- if (state.thread_index == 0) { ++ if (state.thread_index() == 0) { + state.SetItemsProcessed(state.range(0)); + delete external_add_pool; + } +-- +2.31.1 + diff --git a/SOURCES/grpc-1.40.0-python-grpcio-use-system-abseil.patch b/SOURCES/grpc-1.40.0-python-grpcio-use-system-abseil.patch new file mode 100644 index 0000000..31ecb52 --- /dev/null +++ b/SOURCES/grpc-1.40.0-python-grpcio-use-system-abseil.patch @@ -0,0 +1,45 @@ +diff -Naur grpc-1.40.0-original/setup.py grpc-1.40.0/setup.py +--- grpc-1.40.0-original/setup.py 2021-09-03 19:20:52.000000000 -0400 ++++ grpc-1.40.0/setup.py 2021-09-07 14:57:55.247990450 -0400 +@@ -29,6 +29,7 @@ + from distutils import util + import os + import os.path ++import pathlib + import platform + import re + import shlex +@@ -154,6 +155,11 @@ + # runtime, the shared library must be installed + BUILD_WITH_SYSTEM_RE2 = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_RE2', 'False') + ++# Export this variable to use the system installation of abseil. You need to ++# have the header files installed (in /usr/include/absl) and during ++# runtime, the shared library must be installed ++BUILD_WITH_SYSTEM_ABSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ABSL', False) ++ + # Export this variable to force building the python extension with a statically linked libstdc++. + # At least on linux, this is normally not needed as we can build manylinux-compatible wheels on linux just fine + # without statically linking libstdc++ (which leads to a slight increase in the wheel size). +@@ -296,6 +302,10 @@ + CORE_C_FILES = filter(lambda x: 'third_party/re2' not in x, CORE_C_FILES) + RE2_INCLUDE = (os.path.join('/usr', 'include', 're2'),) + ++if BUILD_WITH_SYSTEM_ABSL: ++ CORE_C_FILES = filter(lambda x: 'third_party/abseil-cpp' not in x, CORE_C_FILES) ++ ABSL_INCLUDE = (os.path.join('/usr', 'include'),) ++ + EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE + + ADDRESS_SORTING_INCLUDE + CARES_INCLUDE + + RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE + +@@ -325,6 +335,10 @@ + EXTENSION_LIBRARIES += ('cares',) + if BUILD_WITH_SYSTEM_RE2: + EXTENSION_LIBRARIES += ('re2',) ++if BUILD_WITH_SYSTEM_ABSL: ++ EXTENSION_LIBRARIES += tuple( ++ lib.stem[3:] for lib in pathlib.Path('/usr').glob('lib*/libabsl_*.so') ++ ) + + DEFINE_MACROS = (('_WIN32_WINNT', 0x600),) + asm_files = [] diff --git a/SOURCES/grpc-1.40.0-python2-test-scripts.patch b/SOURCES/grpc-1.40.0-python2-test-scripts.patch new file mode 100644 index 0000000..b5bae55 --- /dev/null +++ b/SOURCES/grpc-1.40.0-python2-test-scripts.patch @@ -0,0 +1,69 @@ +diff -Naur --no-dereference grpc-1.40.0-original/test/core/http/test_server.py grpc-1.40.0/test/core/http/test_server.py +--- grpc-1.40.0-original/test/core/http/test_server.py 2021-09-03 19:20:52.000000000 -0400 ++++ grpc-1.40.0/test/core/http/test_server.py 2021-09-09 11:34:26.772184779 -0400 +@@ -19,7 +19,7 @@ + import ssl + import sys + +-import BaseHTTPServer ++import http.server + + _PEM = os.path.abspath( + os.path.join(os.path.dirname(sys.argv[0]), '../../..', +@@ -27,7 +27,7 @@ + _KEY = os.path.abspath( + os.path.join(os.path.dirname(sys.argv[0]), '../../..', + 'src/core/tsi/test_creds/server1.key')) +-print _PEM ++print(_PEM) + open(_PEM).close() + + argp = argparse.ArgumentParser(description='Server for httpcli_test') +@@ -35,29 +35,29 @@ + argp.add_argument('-s', '--ssl', default=False, action='store_true') + args = argp.parse_args() + +-print 'server running on port %d' % args.port ++print('server running on port %d' % args.port) + + +-class Handler(BaseHTTPServer.BaseHTTPRequestHandler): ++class Handler(http.server.BaseHTTPRequestHandler): + + def good(self): + self.send_response(200) + self.send_header('Content-Type', 'text/html') + self.end_headers() +- self.wfile.write('Hello world!') +- self.wfile.write('

This is a test

') ++ self.wfile.write(b'Hello world!') ++ self.wfile.write(b'

This is a test

') + + def do_GET(self): + if self.path == '/get': + self.good() + + def do_POST(self): +- content = self.rfile.read(int(self.headers.getheader('content-length'))) ++ content = self.rfile.read(int(self.headers.get('content-length'))) + if self.path == '/post' and content == 'hello': + self.good() + + +-httpd = BaseHTTPServer.HTTPServer(('localhost', args.port), Handler) ++httpd = http.server.HTTPServer(('localhost', args.port), Handler) + if args.ssl: + httpd.socket = ssl.wrap_socket(httpd.socket, + certfile=_PEM, +diff -Naur --no-dereference grpc-1.40.0-original/tools/distrib/python_wrapper.sh grpc-1.40.0/tools/distrib/python_wrapper.sh +--- grpc-1.40.0-original/tools/distrib/python_wrapper.sh 2021-09-03 19:20:52.000000000 -0400 ++++ grpc-1.40.0/tools/distrib/python_wrapper.sh 2021-09-09 11:33:47.641824138 -0400 +@@ -14,7 +14,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-for p in python2.7 python2.6 python2 python not_found ; do ++for p in python3 not_found ; do + + python=$(which $p || echo not_found) + diff --git a/SOURCES/grpc.rpmlintrc b/SOURCES/grpc.rpmlintrc new file mode 100644 index 0000000..5f9e915 --- /dev/null +++ b/SOURCES/grpc.rpmlintrc @@ -0,0 +1,16 @@ +# These are not real spelling errors... +addFilter(r' spelling-error .*[ $]en_US$? (microservices|auth|gRPC|' + r'channelz|proto(buf)?|unary|rpc)|grpcio ') +# Maybe some of these are supposed to be CRNL-terminated: +addFilter(r' wrong-file-end-of-line-encoding ' + r'/usr/share/doc/grpc/examples/csharp/') +# We generally follow upstream package metadata for these: +addFilter(r' description-shorter-than-summary') +# Many subpackages do not have their own documentation! +addFilter(r' no-documentation') +# We believe we have patched all calls to SSL_CTX_set_cipher_list with +# hard-coded values to use "PROFILE=SYSTEM" instead, thereby complying with the +# system policy. +addFilter(r' crypto-policy-non-compliance-openssl .* SSL_CTX_set_cipher_list') +# These will not dangle after the ca-certificates dependency is installed: +addFilter(r' dangling-relative-symlink .*\.pem$')