From bd73844208c7b3517fc2b9bcfb7c5fefa7a05955 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 18 Aug 2020 11:23:06 -0700 Subject: [PATCH] Move parse_address library from client_channel to iomgr. --- BUILD | 4 ++-- BUILD.gn | 4 ++-- CMakeLists.txt | 8 +++---- Makefile | 4 ++-- build_autogenerated.yaml | 12 +++++----- config.m4 | 2 +- config.w32 | 2 +- gRPC-C++.podspec | 4 ++-- gRPC-Core.podspec | 6 ++--- grpc.gemspec | 4 ++-- grpc.gyp | 4 ++-- package.xml | 4 ++-- .../client_channel/lb_policy/grpclb/grpclb.cc | 2 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 2 +- .../dns/c_ares/grpc_ares_wrapper_libuv.cc | 2 +- .../dns/c_ares/grpc_ares_wrapper_windows.cc | 2 +- .../resolver/fake/fake_resolver.cc | 2 +- .../resolver/sockaddr/sockaddr_resolver.cc | 2 +- .../ext/filters/client_channel/subchannel.cc | 2 +- .../server_load_reporting_filter.cc | 2 +- .../iomgr}/parse_address.cc | 2 +- .../iomgr}/parse_address.h | 6 ++--- src/python/grpcio/grpc_core_dependencies.py | 2 +- test/core/client_channel/BUILD | 24 ------------------- .../resolvers/fake_resolver_test.cc | 2 +- test/core/iomgr/BUILD | 24 +++++++++++++++++++ .../parse_address_test.cc | 2 +- .../parse_address_with_named_scope_id_test.cc | 2 +- test/core/iomgr/stranded_event_test.cc | 2 +- .../transport/chttp2/too_many_pings_test.cc | 2 +- test/cpp/client/client_channel_stress_test.cc | 2 +- ...channel_with_active_connect_stress_test.cc | 2 +- test/cpp/end2end/client_lb_end2end_test.cc | 2 +- test/cpp/end2end/grpclb_end2end_test.cc | 2 +- .../end2end/service_config_end2end_test.cc | 2 +- test/cpp/end2end/xds_end2end_test.cc | 2 +- test/cpp/naming/resolver_component_test.cc | 2 +- tools/doxygen/Doxyfile.c++.internal | 4 ++-- tools/doxygen/Doxyfile.core.internal | 4 ++-- 39 files changed, 82 insertions(+), 82 deletions(-) rename src/core/{ext/filters/client_channel => lib/iomgr}/parse_address.cc (99%) rename src/core/{ext/filters/client_channel => lib/iomgr}/parse_address.h (91%) rename test/core/{client_channel => iomgr}/parse_address_test.cc (98%) rename test/core/{client_channel => iomgr}/parse_address_with_named_scope_id_test.cc (98%) diff --git a/BUILD b/BUILD index c569482d853..51d821326d5 100644 --- a/BUILD +++ b/BUILD @@ -715,6 +715,7 @@ grpc_cc_library( "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/parse_address.cc", "src/core/lib/iomgr/polling_entity.cc", "src/core/lib/iomgr/pollset.cc", "src/core/lib/iomgr/pollset_custom.cc", @@ -870,6 +871,7 @@ grpc_cc_library( "src/core/lib/iomgr/load_file.h", "src/core/lib/iomgr/lockfree_event.h", "src/core/lib/iomgr/nameser.h", + "src/core/lib/iomgr/parse_address.h", "src/core/lib/iomgr/polling_entity.h", "src/core/lib/iomgr/pollset.h", "src/core/lib/iomgr/pollset_custom.h", @@ -1027,7 +1029,6 @@ grpc_cc_library( "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.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", @@ -1058,7 +1059,6 @@ grpc_cc_library( "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", diff --git a/BUILD.gn b/BUILD.gn index 39b3de12650..d1deedb6ef8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -257,8 +257,6 @@ config("grpc_config") { "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", @@ -688,6 +686,8 @@ config("grpc_config") { "src/core/lib/iomgr/lockfree_event.cc", "src/core/lib/iomgr/lockfree_event.h", "src/core/lib/iomgr/nameser.h", + "src/core/lib/iomgr/parse_address.cc", + "src/core/lib/iomgr/parse_address.h", "src/core/lib/iomgr/poller/eventmanager_libuv.cc", "src/core/lib/iomgr/poller/eventmanager_libuv.h", "src/core/lib/iomgr/polling_entity.cc", diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d679bf6092..0da7de17154 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1423,7 +1423,6 @@ add_library(grpc src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc @@ -1648,6 +1647,7 @@ add_library(grpc 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/parse_address.cc src/core/lib/iomgr/poller/eventmanager_libuv.cc src/core/lib/iomgr/polling_entity.cc src/core/lib/iomgr/pollset.cc @@ -2107,7 +2107,6 @@ add_library(grpc_unsecure src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc @@ -2326,6 +2325,7 @@ add_library(grpc_unsecure 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/parse_address.cc src/core/lib/iomgr/poller/eventmanager_libuv.cc src/core/lib/iomgr/polling_entity.cc src/core/lib/iomgr/pollset.cc @@ -6584,7 +6584,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(parse_address_test - test/core/client_channel/parse_address_test.cc + test/core/iomgr/parse_address_test.cc ) target_include_directories(parse_address_test @@ -6615,7 +6615,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(parse_address_with_named_scope_id_test - test/core/client_channel/parse_address_with_named_scope_id_test.cc + test/core/iomgr/parse_address_with_named_scope_id_test.cc ) target_include_directories(parse_address_with_named_scope_id_test diff --git a/Makefile b/Makefile index 96979e9ece2..d757630fb69 100644 --- a/Makefile +++ b/Makefile @@ -2031,7 +2031,6 @@ LIBGRPC_SRC = \ src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc \ @@ -2256,6 +2255,7 @@ LIBGRPC_SRC = \ 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/parse_address.cc \ src/core/lib/iomgr/poller/eventmanager_libuv.cc \ src/core/lib/iomgr/polling_entity.cc \ src/core/lib/iomgr/pollset.cc \ @@ -2585,7 +2585,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc \ @@ -2804,6 +2803,7 @@ LIBGRPC_UNSECURE_SRC = \ 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/parse_address.cc \ src/core/lib/iomgr/poller/eventmanager_libuv.cc \ src/core/lib/iomgr/polling_entity.cc \ src/core/lib/iomgr/pollset.cc \ diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 7228789cb16..0c5ae95dd82 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -401,7 +401,6 @@ libs: - 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 @@ -607,6 +606,7 @@ libs: - src/core/lib/iomgr/load_file.h - src/core/lib/iomgr/lockfree_event.h - src/core/lib/iomgr/nameser.h + - src/core/lib/iomgr/parse_address.h - src/core/lib/iomgr/poller/eventmanager_libuv.h - src/core/lib/iomgr/polling_entity.h - src/core/lib/iomgr/pollset.h @@ -778,7 +778,6 @@ libs: - src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc @@ -1003,6 +1002,7 @@ libs: - 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/parse_address.cc - src/core/lib/iomgr/poller/eventmanager_libuv.cc - src/core/lib/iomgr/polling_entity.cc - src/core/lib/iomgr/pollset.cc @@ -1338,7 +1338,6 @@ libs: - 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 @@ -1541,6 +1540,7 @@ libs: - src/core/lib/iomgr/load_file.h - src/core/lib/iomgr/lockfree_event.h - src/core/lib/iomgr/nameser.h + - src/core/lib/iomgr/parse_address.h - src/core/lib/iomgr/poller/eventmanager_libuv.h - src/core/lib/iomgr/polling_entity.h - src/core/lib/iomgr/pollset.h @@ -1652,7 +1652,6 @@ libs: - src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc @@ -1871,6 +1870,7 @@ libs: - 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/parse_address.cc - src/core/lib/iomgr/poller/eventmanager_libuv.cc - src/core/lib/iomgr/polling_entity.cc - src/core/lib/iomgr/pollset.cc @@ -3943,7 +3943,7 @@ targets: language: c headers: [] src: - - test/core/client_channel/parse_address_test.cc + - test/core/iomgr/parse_address_test.cc deps: - grpc_test_util - grpc @@ -3955,7 +3955,7 @@ targets: language: c headers: [] src: - - test/core/client_channel/parse_address_with_named_scope_id_test.cc + - test/core/iomgr/parse_address_with_named_scope_id_test.cc deps: - grpc_test_util - grpc diff --git a/config.m4 b/config.m4 index 8b1a28664da..507f28bb74f 100644 --- a/config.m4 +++ b/config.m4 @@ -70,7 +70,6 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc \ @@ -334,6 +333,7 @@ if test "$PHP_GRPC" != "no"; then 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/parse_address.cc \ src/core/lib/iomgr/poller/eventmanager_libuv.cc \ src/core/lib/iomgr/polling_entity.cc \ src/core/lib/iomgr/pollset.cc \ diff --git a/config.w32 b/config.w32 index 76df40bc91c..098467c0902 100644 --- a/config.w32 +++ b/config.w32 @@ -38,7 +38,6 @@ if (PHP_GRPC != "no") { "src\\core\\ext\\filters\\client_channel\\lb_policy\\xds\\xds_routing.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\\dns\\c_ares\\dns_resolver_ares.cc " + @@ -302,6 +301,7 @@ if (PHP_GRPC != "no") { "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\\parse_address.cc " + "src\\core\\lib\\iomgr\\poller\\eventmanager_libuv.cc " + "src\\core\\lib\\iomgr\\polling_entity.cc " + "src\\core\\lib\\iomgr\\pollset.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 35f93c587c8..d70f02cd10a 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -235,7 +235,6 @@ Pod::Spec.new do |s| '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', @@ -468,6 +467,7 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/load_file.h', 'src/core/lib/iomgr/lockfree_event.h', 'src/core/lib/iomgr/nameser.h', + 'src/core/lib/iomgr/parse_address.h', 'src/core/lib/iomgr/poller/eventmanager_libuv.h', 'src/core/lib/iomgr/polling_entity.h', 'src/core/lib/iomgr/pollset.h', @@ -725,7 +725,6 @@ Pod::Spec.new do |s| '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', @@ -958,6 +957,7 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/load_file.h', 'src/core/lib/iomgr/lockfree_event.h', 'src/core/lib/iomgr/nameser.h', + 'src/core/lib/iomgr/parse_address.h', 'src/core/lib/iomgr/poller/eventmanager_libuv.h', 'src/core/lib/iomgr/polling_entity.h', 'src/core/lib/iomgr/pollset.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index b982ab76cb2..9aba1505937 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -242,8 +242,6 @@ Pod::Spec.new do |s| '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', @@ -739,6 +737,8 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/lockfree_event.cc', 'src/core/lib/iomgr/lockfree_event.h', 'src/core/lib/iomgr/nameser.h', + 'src/core/lib/iomgr/parse_address.cc', + 'src/core/lib/iomgr/parse_address.h', 'src/core/lib/iomgr/poller/eventmanager_libuv.cc', 'src/core/lib/iomgr/poller/eventmanager_libuv.h', 'src/core/lib/iomgr/polling_entity.cc', @@ -1134,7 +1134,6 @@ Pod::Spec.new do |s| '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', @@ -1367,6 +1366,7 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/load_file.h', 'src/core/lib/iomgr/lockfree_event.h', 'src/core/lib/iomgr/nameser.h', + 'src/core/lib/iomgr/parse_address.h', 'src/core/lib/iomgr/poller/eventmanager_libuv.h', 'src/core/lib/iomgr/polling_entity.h', 'src/core/lib/iomgr/pollset.h', diff --git a/grpc.gemspec b/grpc.gemspec index c5bd2207a09..93137d5a9be 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -161,8 +161,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/filters/client_channel/lb_policy_registry.h ) s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.cc ) s.files += %w( src/core/ext/filters/client_channel/local_subchannel_pool.h ) - s.files += %w( src/core/ext/filters/client_channel/parse_address.cc ) - s.files += %w( src/core/ext/filters/client_channel/parse_address.h ) s.files += %w( src/core/ext/filters/client_channel/proxy_mapper.h ) s.files += %w( src/core/ext/filters/client_channel/proxy_mapper_registry.cc ) s.files += %w( src/core/ext/filters/client_channel/proxy_mapper_registry.h ) @@ -658,6 +656,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/lockfree_event.cc ) s.files += %w( src/core/lib/iomgr/lockfree_event.h ) s.files += %w( src/core/lib/iomgr/nameser.h ) + s.files += %w( src/core/lib/iomgr/parse_address.cc ) + s.files += %w( src/core/lib/iomgr/parse_address.h ) s.files += %w( src/core/lib/iomgr/poller/eventmanager_libuv.cc ) s.files += %w( src/core/lib/iomgr/poller/eventmanager_libuv.h ) s.files += %w( src/core/lib/iomgr/polling_entity.cc ) diff --git a/grpc.gyp b/grpc.gyp index ae7d87c9d69..e8cf07248db 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -472,7 +472,6 @@ 'src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc', @@ -697,6 +696,7 @@ '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/parse_address.cc', 'src/core/lib/iomgr/poller/eventmanager_libuv.cc', 'src/core/lib/iomgr/polling_entity.cc', 'src/core/lib/iomgr/pollset.cc', @@ -987,7 +987,6 @@ 'src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc', @@ -1206,6 +1205,7 @@ '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/parse_address.cc', 'src/core/lib/iomgr/poller/eventmanager_libuv.cc', 'src/core/lib/iomgr/polling_entity.cc', 'src/core/lib/iomgr/pollset.cc', diff --git a/package.xml b/package.xml index 717113b2d79..dfdcb4c6acc 100644 --- a/package.xml +++ b/package.xml @@ -141,8 +141,6 @@ - - @@ -638,6 +636,8 @@ + + diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index d1b920cbaf2..5dfb43146d9 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -87,7 +87,6 @@ #include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/backoff/backoff.h" @@ -98,6 +97,7 @@ #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/timer.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 4951ff1a5e4..27a8d753c6e 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -37,7 +37,6 @@ #include #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" @@ -45,6 +44,7 @@ #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/nameser.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/transport/authority_override.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc index d9e3293deb6..1d4a90fbd90 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc @@ -23,10 +23,10 @@ #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/iomgr/parse_address.h" bool grpc_ares_query_ipv6() { /* The libuv grpc code currently does not have the code to probe for this, diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc index 1749cf77201..df11db3624d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc @@ -23,10 +23,10 @@ #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/socket_windows.h" bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); } diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index 499d14fb37a..0bfb651a0f5 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -28,13 +28,13 @@ #include #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/work_serializer.h" diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index 20061f81360..35fd576d078 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -26,11 +26,11 @@ #include #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/work_serializer.h" diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index c872e3ed7e4..677e929d0fa 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -33,7 +33,6 @@ #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/health/health_check_client.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h" #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" @@ -46,6 +45,7 @@ #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 01131c7a841..f2444f67836 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -30,11 +30,11 @@ #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h" #include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/src/core/ext/filters/client_channel/parse_address.cc b/src/core/lib/iomgr/parse_address.cc similarity index 99% rename from src/core/ext/filters/client_channel/parse_address.cc rename to src/core/lib/iomgr/parse_address.cc index e9950ac5a94..e945f967558 100644 --- a/src/core/ext/filters/client_channel/parse_address.cc +++ b/src/core/lib/iomgr/parse_address.cc @@ -18,8 +18,8 @@ #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/lib/iomgr/grpc_if_nametoindex.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/src/core/ext/filters/client_channel/parse_address.h b/src/core/lib/iomgr/parse_address.h similarity index 91% rename from src/core/ext/filters/client_channel/parse_address.h rename to src/core/lib/iomgr/parse_address.h index 5c050a2333d..d42daac46ae 100644 --- a/src/core/ext/filters/client_channel/parse_address.h +++ b/src/core/lib/iomgr/parse_address.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PARSE_ADDRESS_H -#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PARSE_ADDRESS_H +#ifndef GRPC_CORE_LIB_IOMGR_PARSE_ADDRESS_H +#define GRPC_CORE_LIB_IOMGR_PARSE_ADDRESS_H #include @@ -50,4 +50,4 @@ bool grpc_parse_ipv6_hostport(const char* hostport, grpc_resolved_address* addr, /* Converts named or numeric port to a uint16 suitable for use in a sockaddr. */ uint16_t grpc_strhtons(const char* port); -#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_PARSE_ADDRESS_H */ +#endif /* GRPC_CORE_LIB_IOMGR_PARSE_ADDRESS_H */ diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 4e9d4ae3ce2..f538ed51dbd 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -47,7 +47,6 @@ CORE_SOURCE_FILES = [ 'src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.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/dns/c_ares/dns_resolver_ares.cc', @@ -311,6 +310,7 @@ CORE_SOURCE_FILES = [ '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/parse_address.cc', 'src/core/lib/iomgr/poller/eventmanager_libuv.cc', 'src/core/lib/iomgr/polling_entity.cc', 'src/core/lib/iomgr/pollset.cc', diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD index 04d7e319e48..a08275749f1 100644 --- a/test/core/client_channel/BUILD +++ b/test/core/client_channel/BUILD @@ -18,30 +18,6 @@ grpc_package(name = "test/core/client_channel") licenses(["notice"]) -grpc_cc_test( - name = "parse_address_test", - srcs = ["parse_address_test.cc"], - language = "C++", - deps = [ - "//:gpr", - "//:grpc", - "//test/core/util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "parse_address_with_named_scope_id_test", - srcs = ["parse_address_with_named_scope_id_test.cc"], - language = "C++", - tags = ["no_windows"], - uses_polling = False, - deps = [ - "//:gpr", - "//:grpc", - "//test/core/util:grpc_test_util", - ], -) - grpc_cc_test( name = "retry_throttle_test", srcs = ["retry_throttle_test.cc"], diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index 92590be5d99..f0316ba4385 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -25,12 +25,12 @@ #include #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/work_serializer.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 7305fb9caac..9773ddd5766 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -388,3 +388,27 @@ grpc_cc_test( "//test/core/util:grpc_test_util", ], ) + +grpc_cc_test( + name = "parse_address_test", + srcs = ["parse_address_test.cc"], + language = "C++", + deps = [ + "//:gpr", + "//:grpc", + "//test/core/util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "parse_address_with_named_scope_id_test", + srcs = ["parse_address_with_named_scope_id_test.cc"], + language = "C++", + tags = ["no_windows"], + uses_polling = False, + deps = [ + "//:gpr", + "//:grpc", + "//test/core/util:grpc_test_util", + ], +) diff --git a/test/core/client_channel/parse_address_test.cc b/test/core/iomgr/parse_address_test.cc similarity index 98% rename from test/core/client_channel/parse_address_test.cc rename to test/core/iomgr/parse_address_test.cc index b77a51a9e49..f0ad08bfed8 100644 --- a/test/core/client_channel/parse_address_test.cc +++ b/test/core/iomgr/parse_address_test.cc @@ -16,7 +16,7 @@ * */ -#include "src/core/ext/filters/client_channel/parse_address.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/test/core/client_channel/parse_address_with_named_scope_id_test.cc b/test/core/iomgr/parse_address_with_named_scope_id_test.cc similarity index 98% rename from test/core/client_channel/parse_address_with_named_scope_id_test.cc rename to test/core/iomgr/parse_address_with_named_scope_id_test.cc index 43c231e19b1..aa499d96e44 100644 --- a/test/core/client_channel/parse_address_with_named_scope_id_test.cc +++ b/test/core/iomgr/parse_address_with_named_scope_id_test.cc @@ -16,7 +16,7 @@ * */ -#include "src/core/ext/filters/client_channel/parse_address.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/test/core/iomgr/stranded_event_test.cc b/test/core/iomgr/stranded_event_test.cc index 81a4d452bce..cdf83d72a1d 100644 --- a/test/core/iomgr/stranded_event_test.cc +++ b/test/core/iomgr/stranded_event_test.cc @@ -40,12 +40,12 @@ #include "absl/strings/str_format.h" #include "absl/types/optional.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 1195a47bd31..6d4921a6c6d 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -39,12 +39,12 @@ #include #include -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" diff --git a/test/cpp/client/client_channel_stress_test.cc b/test/cpp/client/client_channel_stress_test.cc index f9b7bc4343f..f32ed7f6603 100644 --- a/test/cpp/client/client_channel_stress_test.cc +++ b/test/cpp/client/client_channel_stress_test.cc @@ -38,11 +38,11 @@ #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/authority_override.h" diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index d4a942b9870..d1ec7bffdb2 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -38,11 +38,11 @@ #include #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "test/core/util/port.h" diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index df867e6174f..fc4149aaa2a 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -41,7 +41,6 @@ #include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/ext/filters/client_channel/global_subchannel_pool.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/ext/filters/client_channel/service_config.h" @@ -50,6 +49,7 @@ #include "src/core/lib/gpr/env.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/cpp/client/secure_credentials.h" diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 45150fb54ba..f323675b9ba 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -40,12 +40,12 @@ #include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/authority_override.h" diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 6c538c738d1..5e7f9f19ebf 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -42,13 +42,13 @@ #include "src/core/ext/filters/client_channel/backup_poller.h" #include "src/core/ext/filters/client_channel/global_subchannel_pool.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/cpp/client/secure_credentials.h" diff --git a/test/cpp/end2end/xds_end2end_test.cc b/test/cpp/end2end/xds_end2end_test.cc index 0d50af8ebd5..0fb9bff7bc5 100644 --- a/test/cpp/end2end/xds_end2end_test.cc +++ b/test/cpp/end2end/xds_end2end_test.cc @@ -42,7 +42,6 @@ #include "absl/types/optional.h" #include "src/core/ext/filters/client_channel/backup_poller.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/ext/xds/xds_api.h" @@ -51,6 +50,7 @@ #include "src/core/lib/gprpp/map.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/cpp/client/secure_credentials.h" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index a1d52d5a669..d084faf6f7f 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -44,7 +44,6 @@ #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" -#include "src/core/ext/filters/client_channel/parse_address.h" #include "src/core/ext/filters/client_channel/resolver.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" @@ -56,6 +55,7 @@ #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 69342b452a9..6bd1133529a 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1110,8 +1110,6 @@ 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 \ @@ -1607,6 +1605,8 @@ 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/nameser.h \ +src/core/lib/iomgr/parse_address.cc \ +src/core/lib/iomgr/parse_address.h \ src/core/lib/iomgr/poller/eventmanager_libuv.cc \ src/core/lib/iomgr/poller/eventmanager_libuv.h \ src/core/lib/iomgr/polling_entity.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index c9aedb9b822..4654de7c4c4 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -922,8 +922,6 @@ 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 \ @@ -1434,6 +1432,8 @@ 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/nameser.h \ +src/core/lib/iomgr/parse_address.cc \ +src/core/lib/iomgr/parse_address.h \ src/core/lib/iomgr/poller/eventmanager_libuv.cc \ src/core/lib/iomgr/poller/eventmanager_libuv.h \ src/core/lib/iomgr/polling_entity.cc \