From d4c98331874f2717dc03499f0e08820c81079a1e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 31 Mar 2016 13:45:47 -0700 Subject: [PATCH] Reposition files to optionalize client_config system --- BUILD | 184 ++++++++--------- Makefile | 66 +++---- binding.gyp | 32 +-- build.yaml | 64 +++--- config.m4 | 34 ++-- gRPC.podspec | 88 ++++----- grpc.gemspec | 60 +++--- package.json | 60 +++--- package.xml | 60 +++--- src/core/{lib => ext}/client_config/README.md | 0 .../client_config}/channel_connectivity.c | 2 +- .../client_config}/client_channel.c | 2 +- .../client_config}/client_channel.h | 2 +- .../client_config/client_config.c | 2 +- .../client_config/client_config.h | 2 +- .../{lib => ext}/client_config/connector.c | 2 +- .../{lib => ext}/client_config/connector.h | 0 .../default_initial_connect_string.c | 0 .../client_config/initial_connect_string.c | 2 +- .../client_config/initial_connect_string.h | 0 .../{lib => ext}/client_config/lb_policy.c | 2 +- .../{lib => ext}/client_config/lb_policy.h | 2 +- .../client_config/lb_policy_factory.c | 2 +- .../client_config/lb_policy_factory.h | 4 +- .../client_config/lb_policy_registry.c | 2 +- .../client_config/lb_policy_registry.h | 2 +- .../{lib => ext}/client_config/resolver.c | 2 +- .../{lib => ext}/client_config/resolver.h | 4 +- .../client_config/resolver_factory.c | 2 +- .../client_config/resolver_factory.h | 6 +- .../client_config/resolver_registry.c | 2 +- .../client_config/resolver_registry.h | 2 +- .../{lib => ext}/client_config/subchannel.c | 8 +- .../{lib => ext}/client_config/subchannel.h | 2 +- .../client_config/subchannel_factory.c | 2 +- .../client_config/subchannel_factory.h | 2 +- .../client_config/subchannel_index.c | 2 +- .../client_config/subchannel_index.h | 4 +- .../{lib => ext}/client_config/uri_parser.c | 2 +- .../{lib => ext}/client_config/uri_parser.h | 0 .../ext/lb_policy/grpclb/load_balancer_api.h | 2 +- .../ext/lb_policy/pick_first/pick_first.c | 2 +- .../ext/lb_policy/round_robin/round_robin.c | 2 +- .../ext/resolver/dns/native/dns_resolver.c | 4 +- .../ext/resolver/sockaddr/sockaddr_resolver.c | 6 +- .../resolver/zookeeper/zookeeper_resolver.c | 6 +- .../chttp2/client/insecure/channel_create.c | 4 +- .../client/secure/secure_channel_create.c | 4 +- src/core/lib/channel/subchannel_call_holder.h | 2 +- src/core/lib/iomgr/unix_sockets_posix.h | 4 +- src/core/lib/surface/channel.c | 2 +- src/core/lib/surface/channel.h | 2 +- src/core/lib/surface/init.c | 10 +- src/python/grpcio/grpc_core_dependencies.py | 32 +-- test/core/client_config/lb_policies_test.c | 4 +- .../dns_resolver_connectivity_test.c | 2 +- .../resolvers/dns_resolver_test.c | 2 +- .../resolvers/sockaddr_resolver_test.c | 2 +- .../set_initial_connect_string_test.c | 2 +- test/core/client_config/uri_fuzzer_test.c | 2 +- test/core/client_config/uri_parser_test.c | 2 +- test/core/end2end/fixtures/h2_census.c | 2 +- test/core/end2end/fixtures/h2_compress.c | 2 +- test/core/end2end/fixtures/h2_full+pipe.c | 2 +- .../core/end2end/fixtures/h2_full+poll+pipe.c | 2 +- test/core/end2end/fixtures/h2_full+poll.c | 2 +- test/core/end2end/fixtures/h2_full+trace.c | 2 +- test/core/end2end/fixtures/h2_full.c | 2 +- test/core/end2end/fixtures/h2_proxy.c | 2 +- .../core/end2end/fixtures/h2_sockpair+trace.c | 2 +- test/core/end2end/fixtures/h2_sockpair.c | 2 +- .../core/end2end/fixtures/h2_sockpair_1byte.c | 2 +- test/core/end2end/fixtures/h2_uds+poll.c | 2 +- test/core/end2end/fixtures/h2_uds.c | 2 +- test/core/surface/channel_create_test.c | 2 +- .../core/surface/secure_channel_create_test.c | 2 +- tools/doxygen/Doxyfile.core.internal | 60 +++--- tools/gource/gource.sh | 2 +- tools/run_tests/sources_and_headers.json | 182 ++++++++--------- vsprojects/vcxproj/grpc/grpc.vcxproj | 92 ++++----- vsprojects/vcxproj/grpc/grpc.vcxproj.filters | 186 +++++++++--------- .../grpc_unsecure/grpc_unsecure.vcxproj | 92 ++++----- .../grpc_unsecure.vcxproj.filters | 186 +++++++++--------- 83 files changed, 822 insertions(+), 822 deletions(-) rename src/core/{lib => ext}/client_config/README.md (100%) rename src/core/{lib/surface => ext/client_config}/channel_connectivity.c (99%) rename src/core/{lib/channel => ext/client_config}/client_channel.c (99%) rename src/core/{lib/channel => ext/client_config}/client_channel.h (98%) rename src/core/{lib => ext}/client_config/client_config.c (97%) rename src/core/{lib => ext}/client_config/client_config.h (97%) rename src/core/{lib => ext}/client_config/connector.c (97%) rename src/core/{lib => ext}/client_config/connector.h (100%) rename src/core/{lib => ext}/client_config/default_initial_connect_string.c (100%) rename src/core/{lib => ext}/client_config/initial_connect_string.c (97%) rename src/core/{lib => ext}/client_config/initial_connect_string.h (100%) rename src/core/{lib => ext}/client_config/lb_policy.c (99%) rename src/core/{lib => ext}/client_config/lb_policy.h (99%) rename src/core/{lib => ext}/client_config/lb_policy_factory.c (97%) rename src/core/{lib => ext}/client_config/lb_policy_factory.h (96%) rename src/core/{lib => ext}/client_config/lb_policy_registry.c (98%) rename src/core/{lib => ext}/client_config/lb_policy_registry.h (97%) rename src/core/{lib => ext}/client_config/resolver.c (98%) rename src/core/{lib => ext}/client_config/resolver.h (97%) rename src/core/{lib => ext}/client_config/resolver_factory.c (97%) rename src/core/{lib => ext}/client_config/resolver_factory.h (95%) rename src/core/{lib => ext}/client_config/resolver_registry.c (98%) rename src/core/{lib => ext}/client_config/resolver_registry.h (98%) rename src/core/{lib => ext}/client_config/subchannel.c (99%) rename src/core/{lib => ext}/client_config/subchannel.h (99%) rename src/core/{lib => ext}/client_config/subchannel_factory.c (97%) rename src/core/{lib => ext}/client_config/subchannel_factory.h (98%) rename src/core/{lib => ext}/client_config/subchannel_index.c (99%) rename src/core/{lib => ext}/client_config/subchannel_index.h (97%) rename src/core/{lib => ext}/client_config/uri_parser.c (99%) rename src/core/{lib => ext}/client_config/uri_parser.h (100%) diff --git a/BUILD b/BUILD index c0738e20912..6a993605405 100644 --- a/BUILD +++ b/BUILD @@ -166,6 +166,20 @@ cc_library( "src/core/ext/census/grpc_plugin.h", "src/core/ext/census/mlog.h", "src/core/ext/census/rpc_metric_id.h", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", "src/core/ext/transport/chttp2/transport/alpn.h", @@ -192,26 +206,12 @@ cc_library( "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/client_channel.h", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", "src/core/lib/channel/http_client_filter.h", "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/message_compress.h", "src/core/lib/debug/trace.h", @@ -301,6 +301,22 @@ cc_library( "src/core/ext/census/operation.c", "src/core/ext/census/placeholders.c", "src/core/ext/census/tracing.c", + "src/core/ext/client_config/channel_connectivity.c", + "src/core/ext/client_config/client_channel.c", + "src/core/ext/client_config/client_config.c", + "src/core/ext/client_config/connector.c", + "src/core/ext/client_config/default_initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.c", + "src/core/ext/client_config/lb_policy.c", + "src/core/ext/client_config/lb_policy_factory.c", + "src/core/ext/client_config/lb_policy_registry.c", + "src/core/ext/client_config/resolver.c", + "src/core/ext/client_config/resolver_factory.c", + "src/core/ext/client_config/resolver_registry.c", + "src/core/ext/client_config/subchannel.c", + "src/core/ext/client_config/subchannel_factory.c", + "src/core/ext/client_config/subchannel_index.c", + "src/core/ext/client_config/uri_parser.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", "src/core/ext/lb_policy/pick_first/pick_first.c", @@ -335,26 +351,11 @@ cc_library( "src/core/lib/channel/channel_args.c", "src/core/lib/channel/channel_stack.c", "src/core/lib/channel/channel_stack_builder.c", - "src/core/lib/channel/client_channel.c", "src/core/lib/channel/compress_filter.c", "src/core/lib/channel/connected_channel.c", "src/core/lib/channel/http_client_filter.c", "src/core/lib/channel/http_server_filter.c", "src/core/lib/channel/subchannel_call_holder.c", - "src/core/lib/client_config/client_config.c", - "src/core/lib/client_config/connector.c", - "src/core/lib/client_config/default_initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.c", - "src/core/lib/client_config/lb_policy.c", - "src/core/lib/client_config/lb_policy_factory.c", - "src/core/lib/client_config/lb_policy_registry.c", - "src/core/lib/client_config/resolver.c", - "src/core/lib/client_config/resolver_factory.c", - "src/core/lib/client_config/resolver_registry.c", - "src/core/lib/client_config/subchannel.c", - "src/core/lib/client_config/subchannel_factory.c", - "src/core/lib/client_config/subchannel_index.c", - "src/core/lib/client_config/uri_parser.c", "src/core/lib/compression/compression_algorithm.c", "src/core/lib/compression/message_compress.c", "src/core/lib/debug/trace.c", @@ -430,7 +431,6 @@ cc_library( "src/core/lib/surface/call_details.c", "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", - "src/core/lib/surface/channel_connectivity.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", @@ -534,6 +534,20 @@ cc_library( "src/core/ext/census/grpc_plugin.h", "src/core/ext/census/mlog.h", "src/core/ext/census/rpc_metric_id.h", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", "src/core/ext/transport/chttp2/transport/alpn.h", @@ -560,26 +574,12 @@ cc_library( "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/client_channel.h", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", "src/core/lib/channel/http_client_filter.h", "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/message_compress.h", "src/core/lib/debug/trace.h", @@ -655,6 +655,22 @@ cc_library( "src/core/ext/census/operation.c", "src/core/ext/census/placeholders.c", "src/core/ext/census/tracing.c", + "src/core/ext/client_config/channel_connectivity.c", + "src/core/ext/client_config/client_channel.c", + "src/core/ext/client_config/client_config.c", + "src/core/ext/client_config/connector.c", + "src/core/ext/client_config/default_initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.c", + "src/core/ext/client_config/lb_policy.c", + "src/core/ext/client_config/lb_policy_factory.c", + "src/core/ext/client_config/lb_policy_registry.c", + "src/core/ext/client_config/resolver.c", + "src/core/ext/client_config/resolver_factory.c", + "src/core/ext/client_config/resolver_registry.c", + "src/core/ext/client_config/subchannel.c", + "src/core/ext/client_config/subchannel_factory.c", + "src/core/ext/client_config/subchannel_index.c", + "src/core/ext/client_config/uri_parser.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", "src/core/ext/lb_policy/pick_first/pick_first.c", @@ -687,26 +703,11 @@ cc_library( "src/core/lib/channel/channel_args.c", "src/core/lib/channel/channel_stack.c", "src/core/lib/channel/channel_stack_builder.c", - "src/core/lib/channel/client_channel.c", "src/core/lib/channel/compress_filter.c", "src/core/lib/channel/connected_channel.c", "src/core/lib/channel/http_client_filter.c", "src/core/lib/channel/http_server_filter.c", "src/core/lib/channel/subchannel_call_holder.c", - "src/core/lib/client_config/client_config.c", - "src/core/lib/client_config/connector.c", - "src/core/lib/client_config/default_initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.c", - "src/core/lib/client_config/lb_policy.c", - "src/core/lib/client_config/lb_policy_factory.c", - "src/core/lib/client_config/lb_policy_registry.c", - "src/core/lib/client_config/resolver.c", - "src/core/lib/client_config/resolver_factory.c", - "src/core/lib/client_config/resolver_registry.c", - "src/core/lib/client_config/subchannel.c", - "src/core/lib/client_config/subchannel_factory.c", - "src/core/lib/client_config/subchannel_index.c", - "src/core/lib/client_config/uri_parser.c", "src/core/lib/compression/compression_algorithm.c", "src/core/lib/compression/message_compress.c", "src/core/lib/debug/trace.c", @@ -767,7 +768,6 @@ cc_library( "src/core/lib/surface/call_details.c", "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", - "src/core/lib/surface/channel_connectivity.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", @@ -821,8 +821,8 @@ cc_library( cc_library( name = "grpc_zookeeper", srcs = [ - "src/core/lib/client_config/resolvers/zookeeper_resolver.h", - "src/core/lib/client_config/resolvers/zookeeper_resolver.c", + "src/core/ext/client_config/resolvers/zookeeper_resolver.h", + "src/core/ext/client_config/resolvers/zookeeper_resolver.c", ], hdrs = [ "include/grpc/grpc_zookeeper.h", @@ -1364,6 +1364,22 @@ objc_library( "src/core/ext/census/operation.c", "src/core/ext/census/placeholders.c", "src/core/ext/census/tracing.c", + "src/core/ext/client_config/channel_connectivity.c", + "src/core/ext/client_config/client_channel.c", + "src/core/ext/client_config/client_config.c", + "src/core/ext/client_config/connector.c", + "src/core/ext/client_config/default_initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.c", + "src/core/ext/client_config/lb_policy.c", + "src/core/ext/client_config/lb_policy_factory.c", + "src/core/ext/client_config/lb_policy_registry.c", + "src/core/ext/client_config/resolver.c", + "src/core/ext/client_config/resolver_factory.c", + "src/core/ext/client_config/resolver_registry.c", + "src/core/ext/client_config/subchannel.c", + "src/core/ext/client_config/subchannel_factory.c", + "src/core/ext/client_config/subchannel_index.c", + "src/core/ext/client_config/uri_parser.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", "src/core/ext/lb_policy/pick_first/pick_first.c", @@ -1398,26 +1414,11 @@ objc_library( "src/core/lib/channel/channel_args.c", "src/core/lib/channel/channel_stack.c", "src/core/lib/channel/channel_stack_builder.c", - "src/core/lib/channel/client_channel.c", "src/core/lib/channel/compress_filter.c", "src/core/lib/channel/connected_channel.c", "src/core/lib/channel/http_client_filter.c", "src/core/lib/channel/http_server_filter.c", "src/core/lib/channel/subchannel_call_holder.c", - "src/core/lib/client_config/client_config.c", - "src/core/lib/client_config/connector.c", - "src/core/lib/client_config/default_initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.c", - "src/core/lib/client_config/lb_policy.c", - "src/core/lib/client_config/lb_policy_factory.c", - "src/core/lib/client_config/lb_policy_registry.c", - "src/core/lib/client_config/resolver.c", - "src/core/lib/client_config/resolver_factory.c", - "src/core/lib/client_config/resolver_registry.c", - "src/core/lib/client_config/subchannel.c", - "src/core/lib/client_config/subchannel_factory.c", - "src/core/lib/client_config/subchannel_index.c", - "src/core/lib/client_config/uri_parser.c", "src/core/lib/compression/compression_algorithm.c", "src/core/lib/compression/message_compress.c", "src/core/lib/debug/trace.c", @@ -1493,7 +1494,6 @@ objc_library( "src/core/lib/surface/call_details.c", "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", - "src/core/lib/surface/channel_connectivity.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", @@ -1539,6 +1539,20 @@ objc_library( "src/core/ext/census/grpc_plugin.h", "src/core/ext/census/mlog.h", "src/core/ext/census/rpc_metric_id.h", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", "src/core/ext/transport/chttp2/transport/alpn.h", @@ -1565,26 +1579,12 @@ objc_library( "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/client_channel.h", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", "src/core/lib/channel/http_client_filter.h", "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/message_compress.h", "src/core/lib/debug/trace.h", diff --git a/Makefile b/Makefile index 204a34008b1..d546bc07a61 100644 --- a/Makefile +++ b/Makefile @@ -2449,6 +2449,22 @@ LIBGRPC_SRC = \ src/core/ext/census/operation.c \ src/core/ext/census/placeholders.c \ src/core/ext/census/tracing.c \ + src/core/ext/client_config/channel_connectivity.c \ + src/core/ext/client_config/client_channel.c \ + src/core/ext/client_config/client_config.c \ + src/core/ext/client_config/connector.c \ + src/core/ext/client_config/default_initial_connect_string.c \ + src/core/ext/client_config/initial_connect_string.c \ + src/core/ext/client_config/lb_policy.c \ + src/core/ext/client_config/lb_policy_factory.c \ + src/core/ext/client_config/lb_policy_registry.c \ + src/core/ext/client_config/resolver.c \ + src/core/ext/client_config/resolver_factory.c \ + src/core/ext/client_config/resolver_registry.c \ + src/core/ext/client_config/subchannel.c \ + src/core/ext/client_config/subchannel_factory.c \ + src/core/ext/client_config/subchannel_index.c \ + src/core/ext/client_config/uri_parser.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \ src/core/ext/lb_policy/pick_first/pick_first.c \ @@ -2483,26 +2499,11 @@ LIBGRPC_SRC = \ src/core/lib/channel/channel_args.c \ src/core/lib/channel/channel_stack.c \ src/core/lib/channel/channel_stack_builder.c \ - src/core/lib/channel/client_channel.c \ src/core/lib/channel/compress_filter.c \ src/core/lib/channel/connected_channel.c \ src/core/lib/channel/http_client_filter.c \ src/core/lib/channel/http_server_filter.c \ src/core/lib/channel/subchannel_call_holder.c \ - src/core/lib/client_config/client_config.c \ - src/core/lib/client_config/connector.c \ - src/core/lib/client_config/default_initial_connect_string.c \ - src/core/lib/client_config/initial_connect_string.c \ - src/core/lib/client_config/lb_policy.c \ - src/core/lib/client_config/lb_policy_factory.c \ - src/core/lib/client_config/lb_policy_registry.c \ - src/core/lib/client_config/resolver.c \ - src/core/lib/client_config/resolver_factory.c \ - src/core/lib/client_config/resolver_registry.c \ - src/core/lib/client_config/subchannel.c \ - src/core/lib/client_config/subchannel_factory.c \ - src/core/lib/client_config/subchannel_index.c \ - src/core/lib/client_config/uri_parser.c \ src/core/lib/compression/compression_algorithm.c \ src/core/lib/compression/message_compress.c \ src/core/lib/debug/trace.c \ @@ -2578,7 +2579,6 @@ LIBGRPC_SRC = \ src/core/lib/surface/call_details.c \ src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ - src/core/lib/surface/channel_connectivity.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ @@ -2811,6 +2811,22 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/census/operation.c \ src/core/ext/census/placeholders.c \ src/core/ext/census/tracing.c \ + src/core/ext/client_config/channel_connectivity.c \ + src/core/ext/client_config/client_channel.c \ + src/core/ext/client_config/client_config.c \ + src/core/ext/client_config/connector.c \ + src/core/ext/client_config/default_initial_connect_string.c \ + src/core/ext/client_config/initial_connect_string.c \ + src/core/ext/client_config/lb_policy.c \ + src/core/ext/client_config/lb_policy_factory.c \ + src/core/ext/client_config/lb_policy_registry.c \ + src/core/ext/client_config/resolver.c \ + src/core/ext/client_config/resolver_factory.c \ + src/core/ext/client_config/resolver_registry.c \ + src/core/ext/client_config/subchannel.c \ + src/core/ext/client_config/subchannel_factory.c \ + src/core/ext/client_config/subchannel_index.c \ + src/core/ext/client_config/uri_parser.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \ src/core/ext/lb_policy/pick_first/pick_first.c \ @@ -2843,26 +2859,11 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/channel/channel_args.c \ src/core/lib/channel/channel_stack.c \ src/core/lib/channel/channel_stack_builder.c \ - src/core/lib/channel/client_channel.c \ src/core/lib/channel/compress_filter.c \ src/core/lib/channel/connected_channel.c \ src/core/lib/channel/http_client_filter.c \ src/core/lib/channel/http_server_filter.c \ src/core/lib/channel/subchannel_call_holder.c \ - src/core/lib/client_config/client_config.c \ - src/core/lib/client_config/connector.c \ - src/core/lib/client_config/default_initial_connect_string.c \ - src/core/lib/client_config/initial_connect_string.c \ - src/core/lib/client_config/lb_policy.c \ - src/core/lib/client_config/lb_policy_factory.c \ - src/core/lib/client_config/lb_policy_registry.c \ - src/core/lib/client_config/resolver.c \ - src/core/lib/client_config/resolver_factory.c \ - src/core/lib/client_config/resolver_registry.c \ - src/core/lib/client_config/subchannel.c \ - src/core/lib/client_config/subchannel_factory.c \ - src/core/lib/client_config/subchannel_index.c \ - src/core/lib/client_config/uri_parser.c \ src/core/lib/compression/compression_algorithm.c \ src/core/lib/compression/message_compress.c \ src/core/lib/debug/trace.c \ @@ -2923,7 +2924,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/surface/call_details.c \ src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ - src/core/lib/surface/channel_connectivity.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ @@ -3000,7 +3000,7 @@ endif LIBGRPC_ZOOKEEPER_SRC = \ - src/core/lib/client_config/resolvers/zookeeper_resolver.c \ + src/core/ext/client_config/resolvers/zookeeper_resolver.c \ PUBLIC_HEADERS_C += \ include/grpc/grpc_zookeeper.h \ diff --git a/binding.gyp b/binding.gyp index 0a39512ece8..6ce54f7524e 100644 --- a/binding.gyp +++ b/binding.gyp @@ -567,6 +567,22 @@ 'src/core/ext/census/operation.c', 'src/core/ext/census/placeholders.c', 'src/core/ext/census/tracing.c', + 'src/core/ext/client_config/channel_connectivity.c', + 'src/core/ext/client_config/client_channel.c', + 'src/core/ext/client_config/client_config.c', + 'src/core/ext/client_config/connector.c', + 'src/core/ext/client_config/default_initial_connect_string.c', + 'src/core/ext/client_config/initial_connect_string.c', + 'src/core/ext/client_config/lb_policy.c', + 'src/core/ext/client_config/lb_policy_factory.c', + 'src/core/ext/client_config/lb_policy_registry.c', + 'src/core/ext/client_config/resolver.c', + 'src/core/ext/client_config/resolver_factory.c', + 'src/core/ext/client_config/resolver_registry.c', + 'src/core/ext/client_config/subchannel.c', + 'src/core/ext/client_config/subchannel_factory.c', + 'src/core/ext/client_config/subchannel_index.c', + 'src/core/ext/client_config/uri_parser.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c', 'src/core/ext/lb_policy/pick_first/pick_first.c', @@ -601,26 +617,11 @@ 'src/core/lib/channel/channel_args.c', 'src/core/lib/channel/channel_stack.c', 'src/core/lib/channel/channel_stack_builder.c', - 'src/core/lib/channel/client_channel.c', 'src/core/lib/channel/compress_filter.c', 'src/core/lib/channel/connected_channel.c', 'src/core/lib/channel/http_client_filter.c', 'src/core/lib/channel/http_server_filter.c', 'src/core/lib/channel/subchannel_call_holder.c', - 'src/core/lib/client_config/client_config.c', - 'src/core/lib/client_config/connector.c', - 'src/core/lib/client_config/default_initial_connect_string.c', - 'src/core/lib/client_config/initial_connect_string.c', - 'src/core/lib/client_config/lb_policy.c', - 'src/core/lib/client_config/lb_policy_factory.c', - 'src/core/lib/client_config/lb_policy_registry.c', - 'src/core/lib/client_config/resolver.c', - 'src/core/lib/client_config/resolver_factory.c', - 'src/core/lib/client_config/resolver_registry.c', - 'src/core/lib/client_config/subchannel.c', - 'src/core/lib/client_config/subchannel_factory.c', - 'src/core/lib/client_config/subchannel_index.c', - 'src/core/lib/client_config/uri_parser.c', 'src/core/lib/compression/compression_algorithm.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/debug/trace.c', @@ -696,7 +697,6 @@ 'src/core/lib/surface/call_details.c', 'src/core/lib/surface/call_log_batch.c', 'src/core/lib/surface/channel.c', - 'src/core/lib/surface/channel_connectivity.c', 'src/core/lib/surface/channel_init.c', 'src/core/lib/surface/channel_ping.c', 'src/core/lib/surface/channel_stack_type.c', diff --git a/build.yaml b/build.yaml index f644be7380b..48b38f6848e 100644 --- a/build.yaml +++ b/build.yaml @@ -255,29 +255,29 @@ filegroups: - include/grpc/grpc.h - include/grpc/status.h headers: + - src/core/ext/client_config/client_channel.h + - src/core/ext/client_config/client_config.h + - src/core/ext/client_config/connector.h + - src/core/ext/client_config/initial_connect_string.h + - src/core/ext/client_config/lb_policy.h + - src/core/ext/client_config/lb_policy_factory.h + - src/core/ext/client_config/lb_policy_registry.h + - src/core/ext/client_config/resolver.h + - src/core/ext/client_config/resolver_factory.h + - src/core/ext/client_config/resolver_registry.h + - src/core/ext/client_config/subchannel.h + - src/core/ext/client_config/subchannel_factory.h + - src/core/ext/client_config/subchannel_index.h + - src/core/ext/client_config/uri_parser.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/client_channel.h - src/core/lib/channel/compress_filter.h - src/core/lib/channel/connected_channel.h - src/core/lib/channel/context.h - src/core/lib/channel/http_client_filter.h - src/core/lib/channel/http_server_filter.h - src/core/lib/channel/subchannel_call_holder.h - - src/core/lib/client_config/client_config.h - - src/core/lib/client_config/connector.h - - src/core/lib/client_config/initial_connect_string.h - - src/core/lib/client_config/lb_policy.h - - src/core/lib/client_config/lb_policy_factory.h - - src/core/lib/client_config/lb_policy_registry.h - - src/core/lib/client_config/resolver.h - - src/core/lib/client_config/resolver_factory.h - - src/core/lib/client_config/resolver_registry.h - - src/core/lib/client_config/subchannel.h - - src/core/lib/client_config/subchannel_factory.h - - src/core/lib/client_config/subchannel_index.h - - src/core/lib/client_config/uri_parser.h - src/core/lib/compression/algorithm_metadata.h - src/core/lib/compression/message_compress.h - src/core/lib/debug/trace.h @@ -345,29 +345,30 @@ filegroups: - src/core/lib/transport/transport.h - src/core/lib/transport/transport_impl.h src: + - src/core/ext/client_config/channel_connectivity.c + - src/core/ext/client_config/client_channel.c + - src/core/ext/client_config/client_config.c + - src/core/ext/client_config/connector.c + - src/core/ext/client_config/default_initial_connect_string.c + - src/core/ext/client_config/initial_connect_string.c + - src/core/ext/client_config/lb_policy.c + - src/core/ext/client_config/lb_policy_factory.c + - src/core/ext/client_config/lb_policy_registry.c + - src/core/ext/client_config/resolver.c + - src/core/ext/client_config/resolver_factory.c + - src/core/ext/client_config/resolver_registry.c + - src/core/ext/client_config/subchannel.c + - src/core/ext/client_config/subchannel_factory.c + - src/core/ext/client_config/subchannel_index.c + - src/core/ext/client_config/uri_parser.c - src/core/lib/channel/channel_args.c - src/core/lib/channel/channel_stack.c - src/core/lib/channel/channel_stack_builder.c - - src/core/lib/channel/client_channel.c - src/core/lib/channel/compress_filter.c - src/core/lib/channel/connected_channel.c - src/core/lib/channel/http_client_filter.c - src/core/lib/channel/http_server_filter.c - src/core/lib/channel/subchannel_call_holder.c - - src/core/lib/client_config/client_config.c - - src/core/lib/client_config/connector.c - - src/core/lib/client_config/default_initial_connect_string.c - - src/core/lib/client_config/initial_connect_string.c - - src/core/lib/client_config/lb_policy.c - - src/core/lib/client_config/lb_policy_factory.c - - src/core/lib/client_config/lb_policy_registry.c - - src/core/lib/client_config/resolver.c - - src/core/lib/client_config/resolver_factory.c - - src/core/lib/client_config/resolver_registry.c - - src/core/lib/client_config/subchannel.c - - src/core/lib/client_config/subchannel_factory.c - - src/core/lib/client_config/subchannel_index.c - - src/core/lib/client_config/uri_parser.c - src/core/lib/compression/compression_algorithm.c - src/core/lib/compression/message_compress.c - src/core/lib/debug/trace.c @@ -428,7 +429,6 @@ filegroups: - src/core/lib/surface/call_details.c - src/core/lib/surface/call_log_batch.c - src/core/lib/surface/channel.c - - src/core/lib/surface/channel_connectivity.c - src/core/lib/surface/channel_init.c - src/core/lib/surface/channel_ping.c - src/core/lib/surface/channel_stack_type.c @@ -767,9 +767,9 @@ libs: public_headers: - include/grpc/grpc_zookeeper.h headers: - - src/core/lib/client_config/resolvers/zookeeper_resolver.h + - src/core/ext/client_config/resolvers/zookeeper_resolver.h src: - - src/core/lib/client_config/resolvers/zookeeper_resolver.c + - src/core/ext/client_config/resolvers/zookeeper_resolver.c deps: - gpr - grpc diff --git a/config.m4 b/config.m4 index b9a8c35926f..3d3e281ba38 100644 --- a/config.m4 +++ b/config.m4 @@ -89,6 +89,22 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/census/operation.c \ src/core/ext/census/placeholders.c \ src/core/ext/census/tracing.c \ + src/core/ext/client_config/channel_connectivity.c \ + src/core/ext/client_config/client_channel.c \ + src/core/ext/client_config/client_config.c \ + src/core/ext/client_config/connector.c \ + src/core/ext/client_config/default_initial_connect_string.c \ + src/core/ext/client_config/initial_connect_string.c \ + src/core/ext/client_config/lb_policy.c \ + src/core/ext/client_config/lb_policy_factory.c \ + src/core/ext/client_config/lb_policy_registry.c \ + src/core/ext/client_config/resolver.c \ + src/core/ext/client_config/resolver_factory.c \ + src/core/ext/client_config/resolver_registry.c \ + src/core/ext/client_config/subchannel.c \ + src/core/ext/client_config/subchannel_factory.c \ + src/core/ext/client_config/subchannel_index.c \ + src/core/ext/client_config/uri_parser.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \ src/core/ext/lb_policy/pick_first/pick_first.c \ @@ -123,26 +139,11 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/channel/channel_args.c \ src/core/lib/channel/channel_stack.c \ src/core/lib/channel/channel_stack_builder.c \ - src/core/lib/channel/client_channel.c \ src/core/lib/channel/compress_filter.c \ src/core/lib/channel/connected_channel.c \ src/core/lib/channel/http_client_filter.c \ src/core/lib/channel/http_server_filter.c \ src/core/lib/channel/subchannel_call_holder.c \ - src/core/lib/client_config/client_config.c \ - src/core/lib/client_config/connector.c \ - src/core/lib/client_config/default_initial_connect_string.c \ - src/core/lib/client_config/initial_connect_string.c \ - src/core/lib/client_config/lb_policy.c \ - src/core/lib/client_config/lb_policy_factory.c \ - src/core/lib/client_config/lb_policy_registry.c \ - src/core/lib/client_config/resolver.c \ - src/core/lib/client_config/resolver_factory.c \ - src/core/lib/client_config/resolver_registry.c \ - src/core/lib/client_config/subchannel.c \ - src/core/lib/client_config/subchannel_factory.c \ - src/core/lib/client_config/subchannel_index.c \ - src/core/lib/client_config/uri_parser.c \ src/core/lib/compression/compression_algorithm.c \ src/core/lib/compression/message_compress.c \ src/core/lib/debug/trace.c \ @@ -218,7 +219,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/surface/call_details.c \ src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ - src/core/lib/surface/channel_connectivity.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ @@ -548,6 +548,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/boringssl) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/census) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/client_config) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/pick_first) @@ -560,7 +561,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/secure) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/transport) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/http) diff --git a/gRPC.podspec b/gRPC.podspec index 0ef10b28a23..dd60878043d 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -168,6 +168,20 @@ Pod::Spec.new do |s| 'src/core/ext/census/grpc_plugin.h', 'src/core/ext/census/mlog.h', 'src/core/ext/census/rpc_metric_id.h', + 'src/core/ext/client_config/client_channel.h', + 'src/core/ext/client_config/client_config.h', + 'src/core/ext/client_config/connector.h', + 'src/core/ext/client_config/initial_connect_string.h', + 'src/core/ext/client_config/lb_policy.h', + 'src/core/ext/client_config/lb_policy_factory.h', + 'src/core/ext/client_config/lb_policy_registry.h', + 'src/core/ext/client_config/resolver.h', + 'src/core/ext/client_config/resolver_factory.h', + 'src/core/ext/client_config/resolver_registry.h', + 'src/core/ext/client_config/subchannel.h', + 'src/core/ext/client_config/subchannel_factory.h', + 'src/core/ext/client_config/subchannel_index.h', + 'src/core/ext/client_config/uri_parser.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h', 'src/core/ext/transport/chttp2/transport/alpn.h', @@ -194,26 +208,12 @@ Pod::Spec.new do |s| '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/client_channel.h', 'src/core/lib/channel/compress_filter.h', 'src/core/lib/channel/connected_channel.h', 'src/core/lib/channel/context.h', 'src/core/lib/channel/http_client_filter.h', 'src/core/lib/channel/http_server_filter.h', 'src/core/lib/channel/subchannel_call_holder.h', - 'src/core/lib/client_config/client_config.h', - 'src/core/lib/client_config/connector.h', - 'src/core/lib/client_config/initial_connect_string.h', - 'src/core/lib/client_config/lb_policy.h', - 'src/core/lib/client_config/lb_policy_factory.h', - 'src/core/lib/client_config/lb_policy_registry.h', - 'src/core/lib/client_config/resolver.h', - 'src/core/lib/client_config/resolver_factory.h', - 'src/core/lib/client_config/resolver_registry.h', - 'src/core/lib/client_config/subchannel.h', - 'src/core/lib/client_config/subchannel_factory.h', - 'src/core/lib/client_config/subchannel_index.h', - 'src/core/lib/client_config/uri_parser.h', 'src/core/lib/compression/algorithm_metadata.h', 'src/core/lib/compression/message_compress.h', 'src/core/lib/debug/trace.h', @@ -320,6 +320,22 @@ Pod::Spec.new do |s| 'src/core/ext/census/operation.c', 'src/core/ext/census/placeholders.c', 'src/core/ext/census/tracing.c', + 'src/core/ext/client_config/channel_connectivity.c', + 'src/core/ext/client_config/client_channel.c', + 'src/core/ext/client_config/client_config.c', + 'src/core/ext/client_config/connector.c', + 'src/core/ext/client_config/default_initial_connect_string.c', + 'src/core/ext/client_config/initial_connect_string.c', + 'src/core/ext/client_config/lb_policy.c', + 'src/core/ext/client_config/lb_policy_factory.c', + 'src/core/ext/client_config/lb_policy_registry.c', + 'src/core/ext/client_config/resolver.c', + 'src/core/ext/client_config/resolver_factory.c', + 'src/core/ext/client_config/resolver_registry.c', + 'src/core/ext/client_config/subchannel.c', + 'src/core/ext/client_config/subchannel_factory.c', + 'src/core/ext/client_config/subchannel_index.c', + 'src/core/ext/client_config/uri_parser.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c', 'src/core/ext/lb_policy/pick_first/pick_first.c', @@ -354,26 +370,11 @@ Pod::Spec.new do |s| 'src/core/lib/channel/channel_args.c', 'src/core/lib/channel/channel_stack.c', 'src/core/lib/channel/channel_stack_builder.c', - 'src/core/lib/channel/client_channel.c', 'src/core/lib/channel/compress_filter.c', 'src/core/lib/channel/connected_channel.c', 'src/core/lib/channel/http_client_filter.c', 'src/core/lib/channel/http_server_filter.c', 'src/core/lib/channel/subchannel_call_holder.c', - 'src/core/lib/client_config/client_config.c', - 'src/core/lib/client_config/connector.c', - 'src/core/lib/client_config/default_initial_connect_string.c', - 'src/core/lib/client_config/initial_connect_string.c', - 'src/core/lib/client_config/lb_policy.c', - 'src/core/lib/client_config/lb_policy_factory.c', - 'src/core/lib/client_config/lb_policy_registry.c', - 'src/core/lib/client_config/resolver.c', - 'src/core/lib/client_config/resolver_factory.c', - 'src/core/lib/client_config/resolver_registry.c', - 'src/core/lib/client_config/subchannel.c', - 'src/core/lib/client_config/subchannel_factory.c', - 'src/core/lib/client_config/subchannel_index.c', - 'src/core/lib/client_config/uri_parser.c', 'src/core/lib/compression/compression_algorithm.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/debug/trace.c', @@ -449,7 +450,6 @@ Pod::Spec.new do |s| 'src/core/lib/surface/call_details.c', 'src/core/lib/surface/call_log_batch.c', 'src/core/lib/surface/channel.c', - 'src/core/lib/surface/channel_connectivity.c', 'src/core/lib/surface/channel_init.c', 'src/core/lib/surface/channel_ping.c', 'src/core/lib/surface/channel_stack_type.c', @@ -496,6 +496,20 @@ Pod::Spec.new do |s| 'src/core/ext/census/grpc_plugin.h', 'src/core/ext/census/mlog.h', 'src/core/ext/census/rpc_metric_id.h', + 'src/core/ext/client_config/client_channel.h', + 'src/core/ext/client_config/client_config.h', + 'src/core/ext/client_config/connector.h', + 'src/core/ext/client_config/initial_connect_string.h', + 'src/core/ext/client_config/lb_policy.h', + 'src/core/ext/client_config/lb_policy_factory.h', + 'src/core/ext/client_config/lb_policy_registry.h', + 'src/core/ext/client_config/resolver.h', + 'src/core/ext/client_config/resolver_factory.h', + 'src/core/ext/client_config/resolver_registry.h', + 'src/core/ext/client_config/subchannel.h', + 'src/core/ext/client_config/subchannel_factory.h', + 'src/core/ext/client_config/subchannel_index.h', + 'src/core/ext/client_config/uri_parser.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h', 'src/core/ext/transport/chttp2/transport/alpn.h', @@ -522,26 +536,12 @@ Pod::Spec.new do |s| '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/client_channel.h', 'src/core/lib/channel/compress_filter.h', 'src/core/lib/channel/connected_channel.h', 'src/core/lib/channel/context.h', 'src/core/lib/channel/http_client_filter.h', 'src/core/lib/channel/http_server_filter.h', 'src/core/lib/channel/subchannel_call_holder.h', - 'src/core/lib/client_config/client_config.h', - 'src/core/lib/client_config/connector.h', - 'src/core/lib/client_config/initial_connect_string.h', - 'src/core/lib/client_config/lb_policy.h', - 'src/core/lib/client_config/lb_policy_factory.h', - 'src/core/lib/client_config/lb_policy_registry.h', - 'src/core/lib/client_config/resolver.h', - 'src/core/lib/client_config/resolver_factory.h', - 'src/core/lib/client_config/resolver_registry.h', - 'src/core/lib/client_config/subchannel.h', - 'src/core/lib/client_config/subchannel_factory.h', - 'src/core/lib/client_config/subchannel_index.h', - 'src/core/lib/client_config/uri_parser.h', 'src/core/lib/compression/algorithm_metadata.h', 'src/core/lib/compression/message_compress.h', 'src/core/lib/debug/trace.h', diff --git a/grpc.gemspec b/grpc.gemspec index e97d7b68560..8bcc78cac59 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -164,6 +164,20 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/census/grpc_plugin.h ) s.files += %w( src/core/ext/census/mlog.h ) s.files += %w( src/core/ext/census/rpc_metric_id.h ) + s.files += %w( src/core/ext/client_config/client_channel.h ) + s.files += %w( src/core/ext/client_config/client_config.h ) + s.files += %w( src/core/ext/client_config/connector.h ) + s.files += %w( src/core/ext/client_config/initial_connect_string.h ) + s.files += %w( src/core/ext/client_config/lb_policy.h ) + s.files += %w( src/core/ext/client_config/lb_policy_factory.h ) + s.files += %w( src/core/ext/client_config/lb_policy_registry.h ) + s.files += %w( src/core/ext/client_config/resolver.h ) + s.files += %w( src/core/ext/client_config/resolver_factory.h ) + s.files += %w( src/core/ext/client_config/resolver_registry.h ) + s.files += %w( src/core/ext/client_config/subchannel.h ) + s.files += %w( src/core/ext/client_config/subchannel_factory.h ) + s.files += %w( src/core/ext/client_config/subchannel_index.h ) + s.files += %w( src/core/ext/client_config/uri_parser.h ) s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h ) s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h ) s.files += %w( src/core/ext/transport/chttp2/transport/alpn.h ) @@ -190,26 +204,12 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/channel/channel_args.h ) s.files += %w( src/core/lib/channel/channel_stack.h ) s.files += %w( src/core/lib/channel/channel_stack_builder.h ) - s.files += %w( src/core/lib/channel/client_channel.h ) s.files += %w( src/core/lib/channel/compress_filter.h ) s.files += %w( src/core/lib/channel/connected_channel.h ) s.files += %w( src/core/lib/channel/context.h ) s.files += %w( src/core/lib/channel/http_client_filter.h ) s.files += %w( src/core/lib/channel/http_server_filter.h ) s.files += %w( src/core/lib/channel/subchannel_call_holder.h ) - s.files += %w( src/core/lib/client_config/client_config.h ) - s.files += %w( src/core/lib/client_config/connector.h ) - s.files += %w( src/core/lib/client_config/initial_connect_string.h ) - s.files += %w( src/core/lib/client_config/lb_policy.h ) - s.files += %w( src/core/lib/client_config/lb_policy_factory.h ) - s.files += %w( src/core/lib/client_config/lb_policy_registry.h ) - s.files += %w( src/core/lib/client_config/resolver.h ) - s.files += %w( src/core/lib/client_config/resolver_factory.h ) - s.files += %w( src/core/lib/client_config/resolver_registry.h ) - s.files += %w( src/core/lib/client_config/subchannel.h ) - s.files += %w( src/core/lib/client_config/subchannel_factory.h ) - s.files += %w( src/core/lib/client_config/subchannel_index.h ) - s.files += %w( src/core/lib/client_config/uri_parser.h ) s.files += %w( src/core/lib/compression/algorithm_metadata.h ) s.files += %w( src/core/lib/compression/message_compress.h ) s.files += %w( src/core/lib/debug/trace.h ) @@ -303,6 +303,22 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/census/operation.c ) s.files += %w( src/core/ext/census/placeholders.c ) s.files += %w( src/core/ext/census/tracing.c ) + s.files += %w( src/core/ext/client_config/channel_connectivity.c ) + s.files += %w( src/core/ext/client_config/client_channel.c ) + s.files += %w( src/core/ext/client_config/client_config.c ) + s.files += %w( src/core/ext/client_config/connector.c ) + s.files += %w( src/core/ext/client_config/default_initial_connect_string.c ) + s.files += %w( src/core/ext/client_config/initial_connect_string.c ) + s.files += %w( src/core/ext/client_config/lb_policy.c ) + s.files += %w( src/core/ext/client_config/lb_policy_factory.c ) + s.files += %w( src/core/ext/client_config/lb_policy_registry.c ) + s.files += %w( src/core/ext/client_config/resolver.c ) + s.files += %w( src/core/ext/client_config/resolver_factory.c ) + s.files += %w( src/core/ext/client_config/resolver_registry.c ) + s.files += %w( src/core/ext/client_config/subchannel.c ) + s.files += %w( src/core/ext/client_config/subchannel_factory.c ) + s.files += %w( src/core/ext/client_config/subchannel_index.c ) + s.files += %w( src/core/ext/client_config/uri_parser.c ) s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c ) s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c ) s.files += %w( src/core/ext/lb_policy/pick_first/pick_first.c ) @@ -337,26 +353,11 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/channel/channel_args.c ) s.files += %w( src/core/lib/channel/channel_stack.c ) s.files += %w( src/core/lib/channel/channel_stack_builder.c ) - s.files += %w( src/core/lib/channel/client_channel.c ) s.files += %w( src/core/lib/channel/compress_filter.c ) s.files += %w( src/core/lib/channel/connected_channel.c ) s.files += %w( src/core/lib/channel/http_client_filter.c ) s.files += %w( src/core/lib/channel/http_server_filter.c ) s.files += %w( src/core/lib/channel/subchannel_call_holder.c ) - s.files += %w( src/core/lib/client_config/client_config.c ) - s.files += %w( src/core/lib/client_config/connector.c ) - s.files += %w( src/core/lib/client_config/default_initial_connect_string.c ) - s.files += %w( src/core/lib/client_config/initial_connect_string.c ) - s.files += %w( src/core/lib/client_config/lb_policy.c ) - s.files += %w( src/core/lib/client_config/lb_policy_factory.c ) - s.files += %w( src/core/lib/client_config/lb_policy_registry.c ) - s.files += %w( src/core/lib/client_config/resolver.c ) - s.files += %w( src/core/lib/client_config/resolver_factory.c ) - s.files += %w( src/core/lib/client_config/resolver_registry.c ) - s.files += %w( src/core/lib/client_config/subchannel.c ) - s.files += %w( src/core/lib/client_config/subchannel_factory.c ) - s.files += %w( src/core/lib/client_config/subchannel_index.c ) - s.files += %w( src/core/lib/client_config/uri_parser.c ) s.files += %w( src/core/lib/compression/compression_algorithm.c ) s.files += %w( src/core/lib/compression/message_compress.c ) s.files += %w( src/core/lib/debug/trace.c ) @@ -432,7 +433,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/surface/call_details.c ) s.files += %w( src/core/lib/surface/call_log_batch.c ) s.files += %w( src/core/lib/surface/channel.c ) - s.files += %w( src/core/lib/surface/channel_connectivity.c ) s.files += %w( src/core/lib/surface/channel_init.c ) s.files += %w( src/core/lib/surface/channel_ping.c ) s.files += %w( src/core/lib/surface/channel_stack_type.c ) diff --git a/package.json b/package.json index 544d463e2a0..09d07a5aa50 100644 --- a/package.json +++ b/package.json @@ -107,6 +107,20 @@ "src/core/ext/census/grpc_plugin.h", "src/core/ext/census/mlog.h", "src/core/ext/census/rpc_metric_id.h", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", "src/core/ext/transport/chttp2/transport/alpn.h", @@ -133,26 +147,12 @@ "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/client_channel.h", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", "src/core/lib/channel/http_client_filter.h", "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/message_compress.h", "src/core/lib/debug/trace.h", @@ -246,6 +246,22 @@ "src/core/ext/census/operation.c", "src/core/ext/census/placeholders.c", "src/core/ext/census/tracing.c", + "src/core/ext/client_config/channel_connectivity.c", + "src/core/ext/client_config/client_channel.c", + "src/core/ext/client_config/client_config.c", + "src/core/ext/client_config/connector.c", + "src/core/ext/client_config/default_initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.c", + "src/core/ext/client_config/lb_policy.c", + "src/core/ext/client_config/lb_policy_factory.c", + "src/core/ext/client_config/lb_policy_registry.c", + "src/core/ext/client_config/resolver.c", + "src/core/ext/client_config/resolver_factory.c", + "src/core/ext/client_config/resolver_registry.c", + "src/core/ext/client_config/subchannel.c", + "src/core/ext/client_config/subchannel_factory.c", + "src/core/ext/client_config/subchannel_index.c", + "src/core/ext/client_config/uri_parser.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", "src/core/ext/lb_policy/pick_first/pick_first.c", @@ -280,26 +296,11 @@ "src/core/lib/channel/channel_args.c", "src/core/lib/channel/channel_stack.c", "src/core/lib/channel/channel_stack_builder.c", - "src/core/lib/channel/client_channel.c", "src/core/lib/channel/compress_filter.c", "src/core/lib/channel/connected_channel.c", "src/core/lib/channel/http_client_filter.c", "src/core/lib/channel/http_server_filter.c", "src/core/lib/channel/subchannel_call_holder.c", - "src/core/lib/client_config/client_config.c", - "src/core/lib/client_config/connector.c", - "src/core/lib/client_config/default_initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.c", - "src/core/lib/client_config/lb_policy.c", - "src/core/lib/client_config/lb_policy_factory.c", - "src/core/lib/client_config/lb_policy_registry.c", - "src/core/lib/client_config/resolver.c", - "src/core/lib/client_config/resolver_factory.c", - "src/core/lib/client_config/resolver_registry.c", - "src/core/lib/client_config/subchannel.c", - "src/core/lib/client_config/subchannel_factory.c", - "src/core/lib/client_config/subchannel_index.c", - "src/core/lib/client_config/uri_parser.c", "src/core/lib/compression/compression_algorithm.c", "src/core/lib/compression/message_compress.c", "src/core/lib/debug/trace.c", @@ -375,7 +376,6 @@ "src/core/lib/surface/call_details.c", "src/core/lib/surface/call_log_batch.c", "src/core/lib/surface/channel.c", - "src/core/lib/surface/channel_connectivity.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_ping.c", "src/core/lib/surface/channel_stack_type.c", diff --git a/package.xml b/package.xml index 06a6250937a..f29e5109d53 100644 --- a/package.xml +++ b/package.xml @@ -168,6 +168,20 @@ + + + + + + + + + + + + + + @@ -194,26 +208,12 @@ - - - - - - - - - - - - - - @@ -307,6 +307,22 @@ + + + + + + + + + + + + + + + + @@ -341,26 +357,11 @@ - - - - - - - - - - - - - - - @@ -436,7 +437,6 @@ - diff --git a/src/core/lib/client_config/README.md b/src/core/ext/client_config/README.md similarity index 100% rename from src/core/lib/client_config/README.md rename to src/core/ext/client_config/README.md diff --git a/src/core/lib/surface/channel_connectivity.c b/src/core/ext/client_config/channel_connectivity.c similarity index 99% rename from src/core/lib/surface/channel_connectivity.c rename to src/core/ext/client_config/channel_connectivity.c index 9a9ee422c20..3ebc3336081 100644 --- a/src/core/lib/surface/channel_connectivity.c +++ b/src/core/ext/client_config/channel_connectivity.c @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/completion_queue.h" diff --git a/src/core/lib/channel/client_channel.c b/src/core/ext/client_config/client_channel.c similarity index 99% rename from src/core/lib/channel/client_channel.c rename to src/core/ext/client_config/client_channel.c index 3f7cf1cf970..0ff67a7d870 100644 --- a/src/core/lib/channel/client_channel.c +++ b/src/core/ext/client_config/client_channel.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include #include diff --git a/src/core/lib/channel/client_channel.h b/src/core/ext/client_config/client_channel.h similarity index 98% rename from src/core/lib/channel/client_channel.h rename to src/core/ext/client_config/client_channel.h index ac418c8c514..0f5b676e45b 100644 --- a/src/core/lib/channel/client_channel.h +++ b/src/core/ext/client_config/client_channel.h @@ -35,7 +35,7 @@ #define GRPC_CORE_LIB_CHANNEL_CLIENT_CHANNEL_H #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/client_config/resolver.h" +#include "src/core/ext/client_config/resolver.h" /* A client channel is a channel that begins disconnected, and can connect to some endpoint on demand. If that endpoint disconnects, it will be diff --git a/src/core/lib/client_config/client_config.c b/src/core/ext/client_config/client_config.c similarity index 97% rename from src/core/lib/client_config/client_config.c rename to src/core/ext/client_config/client_config.c index 2521023364e..f9b8e686988 100644 --- a/src/core/lib/client_config/client_config.c +++ b/src/core/ext/client_config/client_config.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/client_config.h" +#include "src/core/ext/client_config/client_config.h" #include diff --git a/src/core/lib/client_config/client_config.h b/src/core/ext/client_config/client_config.h similarity index 97% rename from src/core/lib/client_config/client_config.h rename to src/core/ext/client_config/client_config.h index 8dc2f6b299a..2742ea28954 100644 --- a/src/core/lib/client_config/client_config.h +++ b/src/core/ext/client_config/client_config.h @@ -34,7 +34,7 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CONFIG_H #define GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CONFIG_H -#include "src/core/lib/client_config/lb_policy.h" +#include "src/core/ext/client_config/lb_policy.h" /** Total configuration for a client. Provided, and updated, by grpc_resolver */ diff --git a/src/core/lib/client_config/connector.c b/src/core/ext/client_config/connector.c similarity index 97% rename from src/core/lib/client_config/connector.c rename to src/core/ext/client_config/connector.c index 4c7b823dac3..5b629ed5fb1 100644 --- a/src/core/lib/client_config/connector.c +++ b/src/core/ext/client_config/connector.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/connector.h" +#include "src/core/ext/client_config/connector.h" grpc_connector* grpc_connector_ref(grpc_connector* connector) { connector->vtable->ref(connector); diff --git a/src/core/lib/client_config/connector.h b/src/core/ext/client_config/connector.h similarity index 100% rename from src/core/lib/client_config/connector.h rename to src/core/ext/client_config/connector.h diff --git a/src/core/lib/client_config/default_initial_connect_string.c b/src/core/ext/client_config/default_initial_connect_string.c similarity index 100% rename from src/core/lib/client_config/default_initial_connect_string.c rename to src/core/ext/client_config/default_initial_connect_string.c diff --git a/src/core/lib/client_config/initial_connect_string.c b/src/core/ext/client_config/initial_connect_string.c similarity index 97% rename from src/core/lib/client_config/initial_connect_string.c rename to src/core/ext/client_config/initial_connect_string.c index 4034ea2e87d..41580d2106c 100644 --- a/src/core/lib/client_config/initial_connect_string.c +++ b/src/core/ext/client_config/initial_connect_string.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/initial_connect_string.h" +#include "src/core/ext/client_config/initial_connect_string.h" #include diff --git a/src/core/lib/client_config/initial_connect_string.h b/src/core/ext/client_config/initial_connect_string.h similarity index 100% rename from src/core/lib/client_config/initial_connect_string.h rename to src/core/ext/client_config/initial_connect_string.h diff --git a/src/core/lib/client_config/lb_policy.c b/src/core/ext/client_config/lb_policy.c similarity index 99% rename from src/core/lib/client_config/lb_policy.c rename to src/core/ext/client_config/lb_policy.c index 3d23669ec28..72c1cf250c5 100644 --- a/src/core/lib/client_config/lb_policy.c +++ b/src/core/ext/client_config/lb_policy.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/lb_policy.h" +#include "src/core/ext/client_config/lb_policy.h" #define WEAK_REF_BITS 16 diff --git a/src/core/lib/client_config/lb_policy.h b/src/core/ext/client_config/lb_policy.h similarity index 99% rename from src/core/lib/client_config/lb_policy.h rename to src/core/ext/client_config/lb_policy.h index a63e8e68dfd..8779cf06ac1 100644 --- a/src/core/lib/client_config/lb_policy.h +++ b/src/core/ext/client_config/lb_policy.h @@ -34,7 +34,7 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_H #define GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_H -#include "src/core/lib/client_config/subchannel.h" +#include "src/core/ext/client_config/subchannel.h" #include "src/core/lib/transport/connectivity_state.h" /** A load balancing policy: specified by a vtable and a struct (which diff --git a/src/core/lib/client_config/lb_policy_factory.c b/src/core/ext/client_config/lb_policy_factory.c similarity index 97% rename from src/core/lib/client_config/lb_policy_factory.c rename to src/core/ext/client_config/lb_policy_factory.c index 92e1f5f08b9..70e46ef3cfc 100644 --- a/src/core/lib/client_config/lb_policy_factory.c +++ b/src/core/ext/client_config/lb_policy_factory.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/lb_policy_factory.h" +#include "src/core/ext/client_config/lb_policy_factory.h" void grpc_lb_policy_factory_ref(grpc_lb_policy_factory* factory) { factory->vtable->ref(factory); diff --git a/src/core/lib/client_config/lb_policy_factory.h b/src/core/ext/client_config/lb_policy_factory.h similarity index 96% rename from src/core/lib/client_config/lb_policy_factory.h rename to src/core/ext/client_config/lb_policy_factory.h index 6f219128211..7cda216502e 100644 --- a/src/core/lib/client_config/lb_policy_factory.h +++ b/src/core/ext/client_config/lb_policy_factory.h @@ -34,8 +34,8 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_FACTORY_H #define GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_FACTORY_H -#include "src/core/lib/client_config/lb_policy.h" -#include "src/core/lib/client_config/subchannel_factory.h" +#include "src/core/ext/client_config/lb_policy.h" +#include "src/core/ext/client_config/subchannel_factory.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/client_config/lb_policy_registry.c b/src/core/ext/client_config/lb_policy_registry.c similarity index 98% rename from src/core/lib/client_config/lb_policy_registry.c rename to src/core/ext/client_config/lb_policy_registry.c index af396362a16..a23643ecc65 100644 --- a/src/core/lib/client_config/lb_policy_registry.c +++ b/src/core/ext/client_config/lb_policy_registry.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/lb_policy_registry.h" +#include "src/core/ext/client_config/lb_policy_registry.h" #include diff --git a/src/core/lib/client_config/lb_policy_registry.h b/src/core/ext/client_config/lb_policy_registry.h similarity index 97% rename from src/core/lib/client_config/lb_policy_registry.h rename to src/core/ext/client_config/lb_policy_registry.h index 4b8495d8a13..f68dea3d86c 100644 --- a/src/core/lib/client_config/lb_policy_registry.h +++ b/src/core/ext/client_config/lb_policy_registry.h @@ -34,7 +34,7 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_REGISTRY_H #define GRPC_CORE_LIB_CLIENT_CONFIG_LB_POLICY_REGISTRY_H -#include "src/core/lib/client_config/lb_policy_factory.h" +#include "src/core/ext/client_config/lb_policy_factory.h" #include "src/core/lib/iomgr/exec_ctx.h" /** Initialize the registry and set \a default_factory as the factory to be diff --git a/src/core/lib/client_config/resolver.c b/src/core/ext/client_config/resolver.c similarity index 98% rename from src/core/lib/client_config/resolver.c rename to src/core/ext/client_config/resolver.c index b9eef5575fc..eb004455bd0 100644 --- a/src/core/lib/client_config/resolver.c +++ b/src/core/ext/client_config/resolver.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/resolver.h" +#include "src/core/ext/client_config/resolver.h" void grpc_resolver_init(grpc_resolver *resolver, const grpc_resolver_vtable *vtable) { diff --git a/src/core/lib/client_config/resolver.h b/src/core/ext/client_config/resolver.h similarity index 97% rename from src/core/lib/client_config/resolver.h rename to src/core/ext/client_config/resolver.h index cf0bb2bc7ac..226beda85f8 100644 --- a/src/core/lib/client_config/resolver.h +++ b/src/core/ext/client_config/resolver.h @@ -34,8 +34,8 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_H #define GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_H -#include "src/core/lib/client_config/client_config.h" -#include "src/core/lib/client_config/subchannel.h" +#include "src/core/ext/client_config/client_config.h" +#include "src/core/ext/client_config/subchannel.h" #include "src/core/lib/iomgr/iomgr.h" typedef struct grpc_resolver grpc_resolver; diff --git a/src/core/lib/client_config/resolver_factory.c b/src/core/ext/client_config/resolver_factory.c similarity index 97% rename from src/core/lib/client_config/resolver_factory.c rename to src/core/ext/client_config/resolver_factory.c index 001fa28536a..67832dcf59e 100644 --- a/src/core/lib/client_config/resolver_factory.c +++ b/src/core/ext/client_config/resolver_factory.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/resolver_factory.h" +#include "src/core/ext/client_config/resolver_factory.h" void grpc_resolver_factory_ref(grpc_resolver_factory* factory) { factory->vtable->ref(factory); diff --git a/src/core/lib/client_config/resolver_factory.h b/src/core/ext/client_config/resolver_factory.h similarity index 95% rename from src/core/lib/client_config/resolver_factory.h rename to src/core/ext/client_config/resolver_factory.h index a5bca06475b..e5821662781 100644 --- a/src/core/lib/client_config/resolver_factory.h +++ b/src/core/ext/client_config/resolver_factory.h @@ -34,9 +34,9 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_FACTORY_H #define GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_FACTORY_H -#include "src/core/lib/client_config/resolver.h" -#include "src/core/lib/client_config/subchannel_factory.h" -#include "src/core/lib/client_config/uri_parser.h" +#include "src/core/ext/client_config/resolver.h" +#include "src/core/ext/client_config/subchannel_factory.h" +#include "src/core/ext/client_config/uri_parser.h" typedef struct grpc_resolver_factory grpc_resolver_factory; typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable; diff --git a/src/core/lib/client_config/resolver_registry.c b/src/core/ext/client_config/resolver_registry.c similarity index 98% rename from src/core/lib/client_config/resolver_registry.c rename to src/core/ext/client_config/resolver_registry.c index 5f3db273b53..63609e82341 100644 --- a/src/core/lib/client_config/resolver_registry.c +++ b/src/core/ext/client_config/resolver_registry.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include diff --git a/src/core/lib/client_config/resolver_registry.h b/src/core/ext/client_config/resolver_registry.h similarity index 98% rename from src/core/lib/client_config/resolver_registry.h rename to src/core/ext/client_config/resolver_registry.h index 36c4f2fe03a..2de34b32ace 100644 --- a/src/core/lib/client_config/resolver_registry.h +++ b/src/core/ext/client_config/resolver_registry.h @@ -34,7 +34,7 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_REGISTRY_H #define GRPC_CORE_LIB_CLIENT_CONFIG_RESOLVER_REGISTRY_H -#include "src/core/lib/client_config/resolver_factory.h" +#include "src/core/ext/client_config/resolver_factory.h" void grpc_resolver_registry_init(const char *default_prefix); void grpc_resolver_registry_shutdown(void); diff --git a/src/core/lib/client_config/subchannel.c b/src/core/ext/client_config/subchannel.c similarity index 99% rename from src/core/lib/client_config/subchannel.c rename to src/core/ext/client_config/subchannel.c index 47c53a16ba7..452513427a6 100644 --- a/src/core/lib/client_config/subchannel.c +++ b/src/core/ext/client_config/subchannel.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/subchannel.h" +#include "src/core/ext/client_config/subchannel.h" #include @@ -39,10 +39,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" -#include "src/core/lib/client_config/initial_connect_string.h" -#include "src/core/lib/client_config/subchannel_index.h" +#include "src/core/ext/client_config/initial_connect_string.h" +#include "src/core/ext/client_config/subchannel_index.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/support/backoff.h" diff --git a/src/core/lib/client_config/subchannel.h b/src/core/ext/client_config/subchannel.h similarity index 99% rename from src/core/lib/client_config/subchannel.h rename to src/core/ext/client_config/subchannel.h index 68aeff39a1d..71690c23a55 100644 --- a/src/core/lib/client_config/subchannel.h +++ b/src/core/ext/client_config/subchannel.h @@ -35,7 +35,7 @@ #define GRPC_CORE_LIB_CLIENT_CONFIG_SUBCHANNEL_H #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/client_config/connector.h" +#include "src/core/ext/client_config/connector.h" #include "src/core/lib/transport/connectivity_state.h" /** A (sub-)channel that knows how to connect to exactly one target diff --git a/src/core/lib/client_config/subchannel_factory.c b/src/core/ext/client_config/subchannel_factory.c similarity index 97% rename from src/core/lib/client_config/subchannel_factory.c rename to src/core/ext/client_config/subchannel_factory.c index 541368ec96b..d1e4d75a023 100644 --- a/src/core/lib/client_config/subchannel_factory.c +++ b/src/core/ext/client_config/subchannel_factory.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/subchannel_factory.h" +#include "src/core/ext/client_config/subchannel_factory.h" void grpc_subchannel_factory_ref(grpc_subchannel_factory* factory) { factory->vtable->ref(factory); diff --git a/src/core/lib/client_config/subchannel_factory.h b/src/core/ext/client_config/subchannel_factory.h similarity index 98% rename from src/core/lib/client_config/subchannel_factory.h rename to src/core/ext/client_config/subchannel_factory.h index 96d68a20795..6614e935e51 100644 --- a/src/core/lib/client_config/subchannel_factory.h +++ b/src/core/ext/client_config/subchannel_factory.h @@ -35,7 +35,7 @@ #define GRPC_CORE_LIB_CLIENT_CONFIG_SUBCHANNEL_FACTORY_H #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/client_config/subchannel.h" +#include "src/core/ext/client_config/subchannel.h" typedef struct grpc_subchannel_factory grpc_subchannel_factory; typedef struct grpc_subchannel_factory_vtable grpc_subchannel_factory_vtable; diff --git a/src/core/lib/client_config/subchannel_index.c b/src/core/ext/client_config/subchannel_index.c similarity index 99% rename from src/core/lib/client_config/subchannel_index.c rename to src/core/ext/client_config/subchannel_index.c index 2c545002a28..ab8d9bd91d8 100644 --- a/src/core/lib/client_config/subchannel_index.c +++ b/src/core/ext/client_config/subchannel_index.c @@ -31,7 +31,7 @@ // // -#include "src/core/lib/client_config/subchannel_index.h" +#include "src/core/ext/client_config/subchannel_index.h" #include #include diff --git a/src/core/lib/client_config/subchannel_index.h b/src/core/ext/client_config/subchannel_index.h similarity index 97% rename from src/core/lib/client_config/subchannel_index.h rename to src/core/ext/client_config/subchannel_index.h index bc5f03beb42..77972f87198 100644 --- a/src/core/lib/client_config/subchannel_index.h +++ b/src/core/ext/client_config/subchannel_index.h @@ -34,8 +34,8 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_SUBCHANNEL_INDEX_H #define GRPC_CORE_LIB_CLIENT_CONFIG_SUBCHANNEL_INDEX_H -#include "src/core/lib/client_config/connector.h" -#include "src/core/lib/client_config/subchannel.h" +#include "src/core/ext/client_config/connector.h" +#include "src/core/ext/client_config/subchannel.h" /** \file Provides an index of active subchannels so that they can be shared amongst channels */ diff --git a/src/core/lib/client_config/uri_parser.c b/src/core/ext/client_config/uri_parser.c similarity index 99% rename from src/core/lib/client_config/uri_parser.c rename to src/core/ext/client_config/uri_parser.c index b4ee763735e..5b485528d47 100644 --- a/src/core/lib/client_config/uri_parser.c +++ b/src/core/ext/client_config/uri_parser.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/uri_parser.h" +#include "src/core/ext/client_config/uri_parser.h" #include diff --git a/src/core/lib/client_config/uri_parser.h b/src/core/ext/client_config/uri_parser.h similarity index 100% rename from src/core/lib/client_config/uri_parser.h rename to src/core/ext/client_config/uri_parser.h diff --git a/src/core/ext/lb_policy/grpclb/load_balancer_api.h b/src/core/ext/lb_policy/grpclb/load_balancer_api.h index d329a2ffe82..7a550f6da81 100644 --- a/src/core/ext/lb_policy/grpclb/load_balancer_api.h +++ b/src/core/ext/lb_policy/grpclb/load_balancer_api.h @@ -37,7 +37,7 @@ #include #include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h" -#include "src/core/lib/client_config/lb_policy_factory.h" +#include "src/core/ext/client_config/lb_policy_factory.h" #ifdef __cplusplus extern "C" { diff --git a/src/core/ext/lb_policy/pick_first/pick_first.c b/src/core/ext/lb_policy/pick_first/pick_first.c index cb5c40501ee..9afa219aaa9 100644 --- a/src/core/ext/lb_policy/pick_first/pick_first.c +++ b/src/core/ext/lb_policy/pick_first/pick_first.c @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/client_config/lb_policy_registry.h" +#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/lib/transport/connectivity_state.h" typedef struct pending_pick { diff --git a/src/core/ext/lb_policy/round_robin/round_robin.c b/src/core/ext/lb_policy/round_robin/round_robin.c index d94c081494c..eb168a6215c 100644 --- a/src/core/ext/lb_policy/round_robin/round_robin.c +++ b/src/core/ext/lb_policy/round_robin/round_robin.c @@ -35,7 +35,7 @@ #include -#include "src/core/lib/client_config/lb_policy_registry.h" +#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/resolver/dns/native/dns_resolver.c b/src/core/ext/resolver/dns/native/dns_resolver.c index 70d8a3fe2d3..95126ab2032 100644 --- a/src/core/ext/resolver/dns/native/dns_resolver.c +++ b/src/core/ext/resolver/dns/native/dns_resolver.c @@ -37,8 +37,8 @@ #include #include -#include "src/core/lib/client_config/lb_policy_registry.h" -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/lb_policy_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/support/backoff.h" diff --git a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c index 69595ca3db5..3c97e659bff 100644 --- a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c +++ b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,8 +40,8 @@ #include #include -#include "src/core/lib/client_config/lb_policy_registry.h" -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/lb_policy_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/support/string.h" diff --git a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c index a66c9925f05..a8b1f66bc48 100644 --- a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c +++ b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/resolvers/zookeeper_resolver.h" +#include "src/core/ext/client_config/resolvers/zookeeper_resolver.h" #include @@ -41,8 +41,8 @@ #include #include -#include "src/core/lib/client_config/lb_policy_registry.h" -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/lb_policy_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/json/json.h" #include "src/core/lib/support/string.h" diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.c b/src/core/ext/transport/chttp2/client/insecure/channel_create.c index 35450c9e8d3..baa81c99061 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.c +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.c @@ -43,10 +43,10 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/census/grpc_filter.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/compress_filter.h" #include "src/core/lib/channel/http_client_filter.h" -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c index 3465d2b6c4c..a1a70e8d909 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c @@ -42,8 +42,8 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/client_channel.h" -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/client_channel.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/auth_filters.h" #include "src/core/lib/security/credentials.h" diff --git a/src/core/lib/channel/subchannel_call_holder.h b/src/core/lib/channel/subchannel_call_holder.h index 5cf291a266c..8e3a99e40b2 100644 --- a/src/core/lib/channel/subchannel_call_holder.h +++ b/src/core/lib/channel/subchannel_call_holder.h @@ -34,7 +34,7 @@ #ifndef GRPC_CORE_LIB_CHANNEL_SUBCHANNEL_CALL_HOLDER_H #define GRPC_CORE_LIB_CHANNEL_SUBCHANNEL_CALL_HOLDER_H -#include "src/core/lib/client_config/subchannel.h" +#include "src/core/ext/client_config/subchannel.h" /** Pick a subchannel for grpc_subchannel_call_holder; Return 1 if subchannel is available immediately (in which case on_ready diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h index 752cab85a53..22d6af50440 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.h +++ b/src/core/lib/iomgr/unix_sockets_posix.h @@ -38,8 +38,8 @@ #include -#include "src/core/lib/client_config/resolver_factory.h" -#include "src/core/lib/client_config/uri_parser.h" +#include "src/core/ext/client_config/resolver_factory.h" +#include "src/core/ext/client_config/uri_parser.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" diff --git a/src/core/lib/surface/channel.c b/src/core/lib/surface/channel.c index 06f991b0856..332f5045077 100644 --- a/src/core/lib/surface/channel.c +++ b/src/core/lib/surface/channel.c @@ -40,7 +40,7 @@ #include #include -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/support/string.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 640fd7e1379..fc7c805db01 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -35,7 +35,7 @@ #define GRPC_CORE_LIB_SURFACE_CHANNEL_H #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/client_config/subchannel_factory.h" +#include "src/core/ext/client_config/subchannel_factory.h" #include "src/core/lib/surface/channel_stack_type.h" grpc_channel *grpc_channel_create(grpc_exec_ctx *exec_ctx, const char *target, diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c index aca4ce9d076..f221d8db35b 100644 --- a/src/core/lib/surface/init.c +++ b/src/core/lib/surface/init.c @@ -39,17 +39,17 @@ #include #include #include +#include "src/core/ext/client_config/client_channel.h" +#include "src/core/ext/client_config/lb_policy_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" +#include "src/core/ext/client_config/subchannel.h" +#include "src/core/ext/client_config/subchannel_index.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/channel/client_channel.h" #include "src/core/lib/channel/compress_filter.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_client_filter.h" #include "src/core/lib/channel/http_server_filter.h" -#include "src/core/lib/client_config/lb_policy_registry.h" -#include "src/core/lib/client_config/resolver_registry.h" -#include "src/core/lib/client_config/subchannel.h" -#include "src/core/lib/client_config/subchannel_index.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 65ab42c6189..53ea8285fd7 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -83,6 +83,22 @@ CORE_SOURCE_FILES = [ 'src/core/ext/census/operation.c', 'src/core/ext/census/placeholders.c', 'src/core/ext/census/tracing.c', + 'src/core/ext/client_config/channel_connectivity.c', + 'src/core/ext/client_config/client_channel.c', + 'src/core/ext/client_config/client_config.c', + 'src/core/ext/client_config/connector.c', + 'src/core/ext/client_config/default_initial_connect_string.c', + 'src/core/ext/client_config/initial_connect_string.c', + 'src/core/ext/client_config/lb_policy.c', + 'src/core/ext/client_config/lb_policy_factory.c', + 'src/core/ext/client_config/lb_policy_registry.c', + 'src/core/ext/client_config/resolver.c', + 'src/core/ext/client_config/resolver_factory.c', + 'src/core/ext/client_config/resolver_registry.c', + 'src/core/ext/client_config/subchannel.c', + 'src/core/ext/client_config/subchannel_factory.c', + 'src/core/ext/client_config/subchannel_index.c', + 'src/core/ext/client_config/uri_parser.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c', 'src/core/ext/lb_policy/pick_first/pick_first.c', @@ -117,26 +133,11 @@ CORE_SOURCE_FILES = [ 'src/core/lib/channel/channel_args.c', 'src/core/lib/channel/channel_stack.c', 'src/core/lib/channel/channel_stack_builder.c', - 'src/core/lib/channel/client_channel.c', 'src/core/lib/channel/compress_filter.c', 'src/core/lib/channel/connected_channel.c', 'src/core/lib/channel/http_client_filter.c', 'src/core/lib/channel/http_server_filter.c', 'src/core/lib/channel/subchannel_call_holder.c', - 'src/core/lib/client_config/client_config.c', - 'src/core/lib/client_config/connector.c', - 'src/core/lib/client_config/default_initial_connect_string.c', - 'src/core/lib/client_config/initial_connect_string.c', - 'src/core/lib/client_config/lb_policy.c', - 'src/core/lib/client_config/lb_policy_factory.c', - 'src/core/lib/client_config/lb_policy_registry.c', - 'src/core/lib/client_config/resolver.c', - 'src/core/lib/client_config/resolver_factory.c', - 'src/core/lib/client_config/resolver_registry.c', - 'src/core/lib/client_config/subchannel.c', - 'src/core/lib/client_config/subchannel_factory.c', - 'src/core/lib/client_config/subchannel_index.c', - 'src/core/lib/client_config/uri_parser.c', 'src/core/lib/compression/compression_algorithm.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/debug/trace.c', @@ -212,7 +213,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/surface/call_details.c', 'src/core/lib/surface/call_log_batch.c', 'src/core/lib/surface/channel.c', - 'src/core/lib/surface/channel_connectivity.c', 'src/core/lib/surface/channel_init.c', 'src/core/lib/surface/channel_ping.c', 'src/core/lib/surface/channel_stack_type.c', diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index b819f2bc600..e766672cf5d 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -41,9 +41,9 @@ #include #include +#include "src/core/ext/client_config/client_channel.h" +#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/channel/client_channel.h" -#include "src/core/lib/client_config/lb_policy_registry.h" #include "src/core/lib/support/string.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" diff --git a/test/core/client_config/resolvers/dns_resolver_connectivity_test.c b/test/core/client_config/resolvers/dns_resolver_connectivity_test.c index b7c3b78fe19..091257fbb63 100644 --- a/test/core/client_config/resolvers/dns_resolver_connectivity_test.c +++ b/test/core/client_config/resolvers/dns_resolver_connectivity_test.c @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/timer.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_config/resolvers/dns_resolver_test.c b/test/core/client_config/resolvers/dns_resolver_test.c index 0e8a3b13dd3..ce95c656e66 100644 --- a/test/core/client_config/resolvers/dns_resolver_test.c +++ b/test/core/client_config/resolvers/dns_resolver_test.c @@ -35,7 +35,7 @@ #include -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "test/core/util/test_config.h" static void subchannel_factory_ref(grpc_subchannel_factory *scv) {} diff --git a/test/core/client_config/resolvers/sockaddr_resolver_test.c b/test/core/client_config/resolvers/sockaddr_resolver_test.c index 3ce98cebf34..551bb6924e2 100644 --- a/test/core/client_config/resolvers/sockaddr_resolver_test.c +++ b/test/core/client_config/resolvers/sockaddr_resolver_test.c @@ -35,7 +35,7 @@ #include -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "test/core/util/test_config.h" static void subchannel_factory_ref(grpc_subchannel_factory *scv) {} diff --git a/test/core/client_config/set_initial_connect_string_test.c b/test/core/client_config/set_initial_connect_string_test.c index 3ca037355c7..83058d9b2c3 100644 --- a/test/core/client_config/set_initial_connect_string_test.c +++ b/test/core/client_config/set_initial_connect_string_test.c @@ -38,7 +38,7 @@ #include #include -#include "src/core/lib/client_config/initial_connect_string.h" +#include "src/core/ext/client_config/initial_connect_string.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials.h" #include "src/core/lib/support/string.h" diff --git a/test/core/client_config/uri_fuzzer_test.c b/test/core/client_config/uri_fuzzer_test.c index d50a05db206..eb976fc9f53 100644 --- a/test/core/client_config/uri_fuzzer_test.c +++ b/test/core/client_config/uri_fuzzer_test.c @@ -36,7 +36,7 @@ #include -#include "src/core/lib/client_config/uri_parser.h" +#include "src/core/ext/client_config/uri_parser.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { char *s = gpr_malloc(size + 1); diff --git a/test/core/client_config/uri_parser_test.c b/test/core/client_config/uri_parser_test.c index e5d0c378bad..731f16afdd3 100644 --- a/test/core/client_config/uri_parser_test.c +++ b/test/core/client_config/uri_parser_test.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/client_config/uri_parser.h" +#include "src/core/ext/client_config/uri_parser.h" #include diff --git a/test/core/end2end/fixtures/h2_census.c b/test/core/end2end/fixtures/h2_census.c index 9d41ff2dbb4..ef1cf73a05a 100644 --- a/test/core/end2end/fixtures/h2_census.c +++ b/test/core/end2end/fixtures/h2_census.c @@ -43,7 +43,7 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" diff --git a/test/core/end2end/fixtures/h2_compress.c b/test/core/end2end/fixtures/h2_compress.c index 55355b58dda..ddc33ff805b 100644 --- a/test/core/end2end/fixtures/h2_compress.c +++ b/test/core/end2end/fixtures/h2_compress.c @@ -43,7 +43,7 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" diff --git a/test/core/end2end/fixtures/h2_full+pipe.c b/test/core/end2end/fixtures/h2_full+pipe.c index a3e2196bf62..412bb0411c3 100644 --- a/test/core/end2end/fixtures/h2_full+pipe.c +++ b/test/core/end2end/fixtures/h2_full+pipe.c @@ -42,7 +42,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" diff --git a/test/core/end2end/fixtures/h2_full+poll+pipe.c b/test/core/end2end/fixtures/h2_full+poll+pipe.c index 7d57adf6652..a98b92e3245 100644 --- a/test/core/end2end/fixtures/h2_full+poll+pipe.c +++ b/test/core/end2end/fixtures/h2_full+poll+pipe.c @@ -43,7 +43,7 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/iomgr/pollset_posix.h" diff --git a/test/core/end2end/fixtures/h2_full+poll.c b/test/core/end2end/fixtures/h2_full+poll.c index 71a406ebbc0..443b6d49ab7 100644 --- a/test/core/end2end/fixtures/h2_full+poll.c +++ b/test/core/end2end/fixtures/h2_full+poll.c @@ -43,7 +43,7 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/iomgr/pollset_posix.h" diff --git a/test/core/end2end/fixtures/h2_full+trace.c b/test/core/end2end/fixtures/h2_full+trace.c index 986a06bd010..8db44de9609 100644 --- a/test/core/end2end/fixtures/h2_full+trace.c +++ b/test/core/end2end/fixtures/h2_full+trace.c @@ -42,7 +42,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/support/env.h" diff --git a/test/core/end2end/fixtures/h2_full.c b/test/core/end2end/fixtures/h2_full.c index d0797e0a644..786ae1a814c 100644 --- a/test/core/end2end/fixtures/h2_full.c +++ b/test/core/end2end/fixtures/h2_full.c @@ -42,7 +42,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" diff --git a/test/core/end2end/fixtures/h2_proxy.c b/test/core/end2end/fixtures/h2_proxy.c index 4650da98e37..699d4bcff2a 100644 --- a/test/core/end2end/fixtures/h2_proxy.c +++ b/test/core/end2end/fixtures/h2_proxy.c @@ -42,7 +42,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/surface/channel.h" diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 9fdceabbaf7..1b581373be9 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -41,7 +41,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/compress_filter.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_client_filter.h" diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 84777158b6d..0b4df4db14f 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -41,7 +41,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/compress_filter.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_client_filter.h" diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 6b6ca19885f..a84a0d2e40a 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -41,7 +41,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/compress_filter.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_client_filter.h" diff --git a/test/core/end2end/fixtures/h2_uds+poll.c b/test/core/end2end/fixtures/h2_uds+poll.c index 793ffba1259..d91b6df1155 100644 --- a/test/core/end2end/fixtures/h2_uds+poll.c +++ b/test/core/end2end/fixtures/h2_uds+poll.c @@ -46,7 +46,7 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/iomgr/pollset_posix.h" diff --git a/test/core/end2end/fixtures/h2_uds.c b/test/core/end2end/fixtures/h2_uds.c index 9216860a646..d87eb8d79d1 100644 --- a/test/core/end2end/fixtures/h2_uds.c +++ b/test/core/end2end/fixtures/h2_uds.c @@ -45,7 +45,7 @@ #include #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/client_channel.h" +#include "src/core/ext/client_config/client_channel.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/support/string.h" diff --git a/test/core/surface/channel_create_test.c b/test/core/surface/channel_create_test.c index 95b4eaf093d..5ff66bd7a52 100644 --- a/test/core/surface/channel_create_test.c +++ b/test/core/surface/channel_create_test.c @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "test/core/util/test_config.h" void test_unknown_scheme_target(void) { diff --git a/test/core/surface/secure_channel_create_test.c b/test/core/surface/secure_channel_create_test.c index eb710cba38d..80419efce4b 100644 --- a/test/core/surface/secure_channel_create_test.c +++ b/test/core/surface/secure_channel_create_test.c @@ -36,7 +36,7 @@ #include #include #include -#include "src/core/lib/client_config/resolver_registry.h" +#include "src/core/ext/client_config/resolver_registry.h" #include "src/core/lib/security/credentials.h" #include "src/core/lib/security/security_connector.h" #include "src/core/lib/surface/channel.h" diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index fffbc5e3006..481392d198a 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -780,6 +780,20 @@ src/core/ext/census/grpc_filter.h \ src/core/ext/census/grpc_plugin.h \ src/core/ext/census/mlog.h \ src/core/ext/census/rpc_metric_id.h \ +src/core/ext/client_config/client_channel.h \ +src/core/ext/client_config/client_config.h \ +src/core/ext/client_config/connector.h \ +src/core/ext/client_config/initial_connect_string.h \ +src/core/ext/client_config/lb_policy.h \ +src/core/ext/client_config/lb_policy_factory.h \ +src/core/ext/client_config/lb_policy_registry.h \ +src/core/ext/client_config/resolver.h \ +src/core/ext/client_config/resolver_factory.h \ +src/core/ext/client_config/resolver_registry.h \ +src/core/ext/client_config/subchannel.h \ +src/core/ext/client_config/subchannel_factory.h \ +src/core/ext/client_config/subchannel_index.h \ +src/core/ext/client_config/uri_parser.h \ src/core/ext/lb_policy/grpclb/load_balancer_api.h \ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \ src/core/ext/transport/chttp2/transport/alpn.h \ @@ -806,26 +820,12 @@ src/core/ext/transport/chttp2/transport/varint.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/client_channel.h \ src/core/lib/channel/compress_filter.h \ src/core/lib/channel/connected_channel.h \ src/core/lib/channel/context.h \ src/core/lib/channel/http_client_filter.h \ src/core/lib/channel/http_server_filter.h \ src/core/lib/channel/subchannel_call_holder.h \ -src/core/lib/client_config/client_config.h \ -src/core/lib/client_config/connector.h \ -src/core/lib/client_config/initial_connect_string.h \ -src/core/lib/client_config/lb_policy.h \ -src/core/lib/client_config/lb_policy_factory.h \ -src/core/lib/client_config/lb_policy_registry.h \ -src/core/lib/client_config/resolver.h \ -src/core/lib/client_config/resolver_factory.h \ -src/core/lib/client_config/resolver_registry.h \ -src/core/lib/client_config/subchannel.h \ -src/core/lib/client_config/subchannel_factory.h \ -src/core/lib/client_config/subchannel_index.h \ -src/core/lib/client_config/uri_parser.h \ src/core/lib/compression/algorithm_metadata.h \ src/core/lib/compression/message_compress.h \ src/core/lib/debug/trace.h \ @@ -919,6 +919,22 @@ src/core/ext/census/mlog.c \ src/core/ext/census/operation.c \ src/core/ext/census/placeholders.c \ src/core/ext/census/tracing.c \ +src/core/ext/client_config/channel_connectivity.c \ +src/core/ext/client_config/client_channel.c \ +src/core/ext/client_config/client_config.c \ +src/core/ext/client_config/connector.c \ +src/core/ext/client_config/default_initial_connect_string.c \ +src/core/ext/client_config/initial_connect_string.c \ +src/core/ext/client_config/lb_policy.c \ +src/core/ext/client_config/lb_policy_factory.c \ +src/core/ext/client_config/lb_policy_registry.c \ +src/core/ext/client_config/resolver.c \ +src/core/ext/client_config/resolver_factory.c \ +src/core/ext/client_config/resolver_registry.c \ +src/core/ext/client_config/subchannel.c \ +src/core/ext/client_config/subchannel_factory.c \ +src/core/ext/client_config/subchannel_index.c \ +src/core/ext/client_config/uri_parser.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \ src/core/ext/lb_policy/pick_first/pick_first.c \ @@ -953,26 +969,11 @@ src/core/ext/transport/chttp2/transport/writing.c \ src/core/lib/channel/channel_args.c \ src/core/lib/channel/channel_stack.c \ src/core/lib/channel/channel_stack_builder.c \ -src/core/lib/channel/client_channel.c \ src/core/lib/channel/compress_filter.c \ src/core/lib/channel/connected_channel.c \ src/core/lib/channel/http_client_filter.c \ src/core/lib/channel/http_server_filter.c \ src/core/lib/channel/subchannel_call_holder.c \ -src/core/lib/client_config/client_config.c \ -src/core/lib/client_config/connector.c \ -src/core/lib/client_config/default_initial_connect_string.c \ -src/core/lib/client_config/initial_connect_string.c \ -src/core/lib/client_config/lb_policy.c \ -src/core/lib/client_config/lb_policy_factory.c \ -src/core/lib/client_config/lb_policy_registry.c \ -src/core/lib/client_config/resolver.c \ -src/core/lib/client_config/resolver_factory.c \ -src/core/lib/client_config/resolver_registry.c \ -src/core/lib/client_config/subchannel.c \ -src/core/lib/client_config/subchannel_factory.c \ -src/core/lib/client_config/subchannel_index.c \ -src/core/lib/client_config/uri_parser.c \ src/core/lib/compression/compression_algorithm.c \ src/core/lib/compression/message_compress.c \ src/core/lib/debug/trace.c \ @@ -1048,7 +1049,6 @@ src/core/lib/surface/call.c \ src/core/lib/surface/call_details.c \ src/core/lib/surface/call_log_batch.c \ src/core/lib/surface/channel.c \ -src/core/lib/surface/channel_connectivity.c \ src/core/lib/surface/channel_init.c \ src/core/lib/surface/channel_ping.c \ src/core/lib/surface/channel_stack_type.c \ diff --git a/tools/gource/gource.sh b/tools/gource/gource.sh index 167a256b848..bf6bf0ec890 100755 --- a/tools/gource/gource.sh +++ b/tools/gource/gource.sh @@ -28,4 +28,4 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -gource -c 4 -s 0.1 --max-file-lag 0.05 --max-files 0 -e 0.01 --hide filenames,dirnames --file-filter 'doc/ref|vsprojects/vcxproj' $* +gource -c 4 -s 0.1 --max-file-lag 0.05 --max-files 0 -e 0.01 --file-idle-time 1000000 --hide filenames,dirnames $* diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 9690ae04219..38110d780e7 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -4043,6 +4043,20 @@ "src/core/ext/census/grpc_plugin.h", "src/core/ext/census/mlog.h", "src/core/ext/census/rpc_metric_id.h", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", "src/core/ext/transport/chttp2/transport/alpn.h", @@ -4069,26 +4083,12 @@ "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/client_channel.h", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", "src/core/lib/channel/http_client_filter.h", "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/message_compress.h", "src/core/lib/debug/trace.h", @@ -4206,6 +4206,36 @@ "src/core/ext/census/placeholders.c", "src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/tracing.c", + "src/core/ext/client_config/channel_connectivity.c", + "src/core/ext/client_config/client_channel.c", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.c", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.c", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/default_initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.c", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.c", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.c", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.c", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.c", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.c", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.c", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.c", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.c", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.c", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", @@ -4266,8 +4296,6 @@ "src/core/lib/channel/channel_stack.h", "src/core/lib/channel/channel_stack_builder.c", "src/core/lib/channel/channel_stack_builder.h", - "src/core/lib/channel/client_channel.c", - "src/core/lib/channel/client_channel.h", "src/core/lib/channel/compress_filter.c", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.c", @@ -4279,33 +4307,6 @@ "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.c", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.c", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.c", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/default_initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.c", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.c", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.c", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.c", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.c", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.c", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.c", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.c", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.c", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.c", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/compression_algorithm.c", "src/core/lib/compression/message_compress.c", @@ -4441,7 +4442,6 @@ "src/core/lib/surface/call_test_only.h", "src/core/lib/surface/channel.c", "src/core/lib/surface/channel.h", - "src/core/lib/surface/channel_connectivity.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_init.h", "src/core/lib/surface/channel_ping.c", @@ -4664,6 +4664,20 @@ "src/core/ext/census/grpc_plugin.h", "src/core/ext/census/mlog.h", "src/core/ext/census/rpc_metric_id.h", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", "src/core/ext/transport/chttp2/transport/alpn.h", @@ -4690,26 +4704,12 @@ "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/client_channel.h", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", "src/core/lib/channel/http_client_filter.h", "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/message_compress.h", "src/core/lib/debug/trace.h", @@ -4812,6 +4812,36 @@ "src/core/ext/census/placeholders.c", "src/core/ext/census/rpc_metric_id.h", "src/core/ext/census/tracing.c", + "src/core/ext/client_config/channel_connectivity.c", + "src/core/ext/client_config/client_channel.c", + "src/core/ext/client_config/client_channel.h", + "src/core/ext/client_config/client_config.c", + "src/core/ext/client_config/client_config.h", + "src/core/ext/client_config/connector.c", + "src/core/ext/client_config/connector.h", + "src/core/ext/client_config/default_initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.c", + "src/core/ext/client_config/initial_connect_string.h", + "src/core/ext/client_config/lb_policy.c", + "src/core/ext/client_config/lb_policy.h", + "src/core/ext/client_config/lb_policy_factory.c", + "src/core/ext/client_config/lb_policy_factory.h", + "src/core/ext/client_config/lb_policy_registry.c", + "src/core/ext/client_config/lb_policy_registry.h", + "src/core/ext/client_config/resolver.c", + "src/core/ext/client_config/resolver.h", + "src/core/ext/client_config/resolver_factory.c", + "src/core/ext/client_config/resolver_factory.h", + "src/core/ext/client_config/resolver_registry.c", + "src/core/ext/client_config/resolver_registry.h", + "src/core/ext/client_config/subchannel.c", + "src/core/ext/client_config/subchannel.h", + "src/core/ext/client_config/subchannel_factory.c", + "src/core/ext/client_config/subchannel_factory.h", + "src/core/ext/client_config/subchannel_index.c", + "src/core/ext/client_config/subchannel_index.h", + "src/core/ext/client_config/uri_parser.c", + "src/core/ext/client_config/uri_parser.h", "src/core/ext/lb_policy/grpclb/load_balancer_api.c", "src/core/ext/lb_policy/grpclb/load_balancer_api.h", "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", @@ -4870,8 +4900,6 @@ "src/core/lib/channel/channel_stack.h", "src/core/lib/channel/channel_stack_builder.c", "src/core/lib/channel/channel_stack_builder.h", - "src/core/lib/channel/client_channel.c", - "src/core/lib/channel/client_channel.h", "src/core/lib/channel/compress_filter.c", "src/core/lib/channel/compress_filter.h", "src/core/lib/channel/connected_channel.c", @@ -4883,33 +4911,6 @@ "src/core/lib/channel/http_server_filter.h", "src/core/lib/channel/subchannel_call_holder.c", "src/core/lib/channel/subchannel_call_holder.h", - "src/core/lib/client_config/client_config.c", - "src/core/lib/client_config/client_config.h", - "src/core/lib/client_config/connector.c", - "src/core/lib/client_config/connector.h", - "src/core/lib/client_config/default_initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.c", - "src/core/lib/client_config/initial_connect_string.h", - "src/core/lib/client_config/lb_policy.c", - "src/core/lib/client_config/lb_policy.h", - "src/core/lib/client_config/lb_policy_factory.c", - "src/core/lib/client_config/lb_policy_factory.h", - "src/core/lib/client_config/lb_policy_registry.c", - "src/core/lib/client_config/lb_policy_registry.h", - "src/core/lib/client_config/resolver.c", - "src/core/lib/client_config/resolver.h", - "src/core/lib/client_config/resolver_factory.c", - "src/core/lib/client_config/resolver_factory.h", - "src/core/lib/client_config/resolver_registry.c", - "src/core/lib/client_config/resolver_registry.h", - "src/core/lib/client_config/subchannel.c", - "src/core/lib/client_config/subchannel.h", - "src/core/lib/client_config/subchannel_factory.c", - "src/core/lib/client_config/subchannel_factory.h", - "src/core/lib/client_config/subchannel_index.c", - "src/core/lib/client_config/subchannel_index.h", - "src/core/lib/client_config/uri_parser.c", - "src/core/lib/client_config/uri_parser.h", "src/core/lib/compression/algorithm_metadata.h", "src/core/lib/compression/compression_algorithm.c", "src/core/lib/compression/message_compress.c", @@ -5021,7 +5022,6 @@ "src/core/lib/surface/call_test_only.h", "src/core/lib/surface/channel.c", "src/core/lib/surface/channel.h", - "src/core/lib/surface/channel_connectivity.c", "src/core/lib/surface/channel_init.c", "src/core/lib/surface/channel_init.h", "src/core/lib/surface/channel_ping.c", @@ -5068,14 +5068,14 @@ ], "headers": [ "include/grpc/grpc_zookeeper.h", - "src/core/lib/client_config/resolvers/zookeeper_resolver.h" + "src/core/ext/client_config/resolvers/zookeeper_resolver.h" ], "language": "c", "name": "grpc_zookeeper", "src": [ "include/grpc/grpc_zookeeper.h", - "src/core/lib/client_config/resolvers/zookeeper_resolver.c", - "src/core/lib/client_config/resolvers/zookeeper_resolver.h" + "src/core/ext/client_config/resolvers/zookeeper_resolver.c", + "src/core/ext/client_config/resolvers/zookeeper_resolver.h" ], "third_party": false, "type": "lib" diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index ab95af9d103..53a110df4b9 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -289,6 +289,20 @@ + + + + + + + + + + + + + + @@ -315,26 +329,12 @@ - - - - - - - - - - - - - - @@ -439,6 +439,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -507,8 +539,6 @@ - - @@ -519,34 +549,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -697,8 +699,6 @@ - - diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index ad03c802262..66e0874a91f 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -28,6 +28,54 @@ src\core\ext\census + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + src\core\ext\lb_policy\grpclb @@ -130,9 +178,6 @@ src\core\lib\channel - - src\core\lib\channel - src\core\lib\channel @@ -148,48 +193,6 @@ src\core\lib\channel - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - src\core\lib\compression @@ -415,9 +418,6 @@ src\core\lib\surface - - src\core\lib\surface - src\core\lib\surface @@ -560,6 +560,48 @@ src\core\ext\census + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + src\core\ext\lb_policy\grpclb @@ -638,9 +680,6 @@ src\core\lib\channel - - src\core\lib\channel - src\core\lib\channel @@ -659,45 +698,6 @@ src\core\lib\channel - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - src\core\lib\compression @@ -977,6 +977,9 @@ {9bf70bd2-f553-11b2-c237-abd148971eea} + + {003725f8-37fc-80b5-deba-baae32caf915} + {030f00ff-6c54-76c8-12df-37e3008335d1} @@ -1046,9 +1049,6 @@ {1931b044-90f3-cd68-b5f8-23be77ca8efc} - - {2f3260de-be57-d18d-6882-61d115baa159} - {dadf7fe9-3f15-d431-e4f6-f987b090536c} diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index 08a0344c115..9d4fdf8ad25 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -279,6 +279,20 @@ + + + + + + + + + + + + + + @@ -305,26 +319,12 @@ - - - - - - - - - - - - - - @@ -415,6 +415,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -479,8 +511,6 @@ - - @@ -491,34 +521,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -639,8 +641,6 @@ - - diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index a2c3aaa4254..f875519323e 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -28,6 +28,54 @@ src\core\ext\census + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + src\core\ext\lb_policy\grpclb @@ -124,9 +172,6 @@ src\core\lib\channel - - src\core\lib\channel - src\core\lib\channel @@ -142,48 +187,6 @@ src\core\lib\channel - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - src\core\lib\compression @@ -364,9 +367,6 @@ src\core\lib\surface - - src\core\lib\surface - src\core\lib\surface @@ -497,6 +497,48 @@ src\core\ext\census + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + + + src\core\ext\client_config + src\core\ext\lb_policy\grpclb @@ -575,9 +617,6 @@ src\core\lib\channel - - src\core\lib\channel - src\core\lib\channel @@ -596,45 +635,6 @@ src\core\lib\channel - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - - - src\core\lib\client_config - src\core\lib\compression @@ -872,6 +872,9 @@ {3f21cd12-b8b9-18f8-8780-e21bbe2285d0} + + {25fa8af3-0a05-987c-741f-fa8ff9d65d51} + {a23781d2-27e4-7cb0-12cd-59782ecb21ce} @@ -935,9 +938,6 @@ {fb964f3d-a59c-a7ba-fee5-6072dbb94a7b} - - {29ca2974-89e4-1a74-3e4d-0d63e2f77566} - {b88002e9-185e-4e64-49f5-2d8989ce87f6}