Reposition files to optionalize client_config system

narzolliam · Mar 31, 2016 · d4c9833 · d4c9833
1 parent dfa160e
commit d4c9833
Show file tree

Hide file tree

Showing 83 changed files with 822 additions and 822 deletions.
diff --git a/BUILD b/BUILD
diff --git 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
@@ -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
@@ -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
@@ -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)