Begin optionalizing lb policies: initial code movement

narzolliam · Mar 29, 2016 · 14e0d98 · 14e0d98
1 parent 078ff3b
commit 14e0d98
Show file tree

Hide file tree

Showing 26 changed files with 135 additions and 135 deletions.
diff --git a/BUILD b/BUILD
@@ -196,9 +196,9 @@ cc_library(
  "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_policies/load_balancer_api.h",
- "src/core/lib/client_config/lb_policies/pick_first.h",
- "src/core/lib/client_config/lb_policies/round_robin.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/pick_first/pick_first.h",
+ "src/core/ext/lb_policy/round_robin/round_robin.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",
@@ -258,7 +258,7 @@ cc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/security/auth_filters.h",
  "src/core/lib/security/b64.h",
  "src/core/lib/security/credentials.h",
@@ -345,9 +345,9 @@ cc_library(
  "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_policies/load_balancer_api.c",
- "src/core/lib/client_config/lb_policies/pick_first.c",
- "src/core/lib/client_config/lb_policies/round_robin.c",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+ "src/core/ext/lb_policy/pick_first/pick_first.c",
+ "src/core/ext/lb_policy/round_robin/round_robin.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",
@@ -413,7 +413,7 @@ cc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/security/b64.c",
  "src/core/lib/security/client_auth_filter.c",
  "src/core/lib/security/credentials.c",
@@ -571,9 +571,9 @@ cc_library(
  "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_policies/load_balancer_api.h",
- "src/core/lib/client_config/lb_policies/pick_first.h",
- "src/core/lib/client_config/lb_policies/round_robin.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/pick_first/pick_first.h",
+ "src/core/ext/lb_policy/round_robin/round_robin.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",
@@ -633,7 +633,7 @@ cc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/statistics/census_interface.h",
  "src/core/lib/statistics/census_rpc_stats.h",
  "src/core/lib/surface/api_trace.h",
@@ -704,9 +704,9 @@ cc_library(
  "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_policies/load_balancer_api.c",
- "src/core/lib/client_config/lb_policies/pick_first.c",
- "src/core/lib/client_config/lb_policies/round_robin.c",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+ "src/core/ext/lb_policy/pick_first/pick_first.c",
+ "src/core/ext/lb_policy/round_robin/round_robin.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",
@@ -771,7 +771,7 @@ cc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/surface/alarm.c",
  "src/core/lib/surface/api_trace.c",
  "src/core/lib/surface/byte_buffer.c",
@@ -1407,9 +1407,9 @@ objc_library(
  "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_policies/load_balancer_api.c",
- "src/core/lib/client_config/lb_policies/pick_first.c",
- "src/core/lib/client_config/lb_policies/round_robin.c",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+ "src/core/ext/lb_policy/pick_first/pick_first.c",
+ "src/core/ext/lb_policy/round_robin/round_robin.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",
@@ -1475,7 +1475,7 @@ objc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/security/b64.c",
  "src/core/lib/security/client_auth_filter.c",
  "src/core/lib/security/credentials.c",
@@ -1578,9 +1578,9 @@ objc_library(
  "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_policies/load_balancer_api.h",
- "src/core/lib/client_config/lb_policies/pick_first.h",
- "src/core/lib/client_config/lb_policies/round_robin.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/pick_first/pick_first.h",
+ "src/core/ext/lb_policy/round_robin/round_robin.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",
@@ -1640,7 +1640,7 @@ objc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/security/auth_filters.h",
  "src/core/lib/security/b64.h",
  "src/core/lib/security/credentials.h",

diff --git a/Makefile b/Makefile
@@ -2467,9 +2467,9 @@ LIBGRPC_SRC = \
  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_policies/load_balancer_api.c \
- src/core/lib/client_config/lb_policies/pick_first.c \
- src/core/lib/client_config/lb_policies/round_robin.c \
+ src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+ src/core/ext/lb_policy/pick_first/pick_first.c \
+ src/core/ext/lb_policy/round_robin/round_robin.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 \
@@ -2535,7 +2535,7 @@ LIBGRPC_SRC = \
  src/core/lib/json/json_reader.c \
  src/core/lib/json/json_string.c \
  src/core/lib/json/json_writer.c \
- src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/lib/security/b64.c \
  src/core/lib/security/client_auth_filter.c \
  src/core/lib/security/credentials.c \
@@ -2826,9 +2826,9 @@ LIBGRPC_UNSECURE_SRC = \
  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_policies/load_balancer_api.c \
- src/core/lib/client_config/lb_policies/pick_first.c \
- src/core/lib/client_config/lb_policies/round_robin.c \
+ src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+ src/core/ext/lb_policy/pick_first/pick_first.c \
+ src/core/ext/lb_policy/round_robin/round_robin.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 \
@@ -2893,7 +2893,7 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/lib/json/json_reader.c \
  src/core/lib/json/json_string.c \
  src/core/lib/json/json_writer.c \
- src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/lib/surface/alarm.c \
  src/core/lib/surface/api_trace.c \
  src/core/lib/surface/byte_buffer.c \

diff --git a/binding.gyp b/binding.gyp
@@ -605,9 +605,9 @@
  '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_policies/load_balancer_api.c',
- 'src/core/lib/client_config/lb_policies/pick_first.c',
- 'src/core/lib/client_config/lb_policies/round_robin.c',
+ 'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
+ 'src/core/ext/lb_policy/pick_first/pick_first.c',
+ 'src/core/ext/lb_policy/round_robin/round_robin.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',
@@ -673,7 +673,7 @@
  'src/core/lib/json/json_reader.c',
  'src/core/lib/json/json_string.c',
  'src/core/lib/json/json_writer.c',
- 'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/lib/security/b64.c',
  'src/core/lib/security/client_auth_filter.c',
  'src/core/lib/security/credentials.c',

diff --git a/build.yaml b/build.yaml
@@ -262,9 +262,9 @@ filegroups:
  - 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_policies/load_balancer_api.h
- - src/core/lib/client_config/lb_policies/pick_first.h
- - src/core/lib/client_config/lb_policies/round_robin.h
+ - src/core/ext/lb_policy/grpclb/load_balancer_api.h
+ - src/core/ext/lb_policy/pick_first/pick_first.h
+ - src/core/ext/lb_policy/round_robin/round_robin.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
@@ -324,7 +324,7 @@ filegroups:
  - src/core/lib/json/json_common.h
  - src/core/lib/json/json_reader.h
  - src/core/lib/json/json_writer.h
- - src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h
+ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
  - src/core/lib/statistics/census_interface.h
  - src/core/lib/statistics/census_rpc_stats.h
  - src/core/lib/surface/api_trace.h
@@ -363,9 +363,9 @@ filegroups:
  - 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_policies/load_balancer_api.c
- - src/core/lib/client_config/lb_policies/pick_first.c
- - src/core/lib/client_config/lb_policies/round_robin.c
+ - src/core/ext/lb_policy/grpclb/load_balancer_api.c
+ - src/core/ext/lb_policy/pick_first/pick_first.c
+ - src/core/ext/lb_policy/round_robin/round_robin.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
@@ -430,7 +430,7 @@ filegroups:
  - src/core/lib/json/json_reader.c
  - src/core/lib/json/json_string.c
  - src/core/lib/json/json_writer.c
- - src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c
+ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
  - src/core/lib/surface/alarm.c
  - src/core/lib/surface/api_trace.c
  - src/core/lib/surface/byte_buffer.c

diff --git a/config.m4 b/config.m4
@@ -127,9 +127,9 @@ if test "$PHP_GRPC" != "no"; then
  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_policies/load_balancer_api.c \
- src/core/lib/client_config/lb_policies/pick_first.c \
- src/core/lib/client_config/lb_policies/round_robin.c \
+ src/core/ext/lb_policy/grpclb/load_balancer_api.c \
+ src/core/ext/lb_policy/pick_first/pick_first.c \
+ src/core/ext/lb_policy/round_robin/round_robin.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 \
@@ -195,7 +195,7 @@ if test "$PHP_GRPC" != "no"; then
  src/core/lib/json/json_reader.c \
  src/core/lib/json/json_string.c \
  src/core/lib/json/json_writer.c \
- src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/lib/security/b64.c \
  src/core/lib/security/client_auth_filter.c \
  src/core/lib/security/credentials.c \
@@ -562,7 +562,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/profiling)
- PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/proto/grpc/lb/v0)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/support)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface)

diff --git a/gRPC.podspec b/gRPC.podspec
@@ -200,9 +200,9 @@ Pod::Spec.new do |s|
  '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_policies/load_balancer_api.h',
- 'src/core/lib/client_config/lb_policies/pick_first.h',
- 'src/core/lib/client_config/lb_policies/round_robin.h',
+ 'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
+ 'src/core/ext/lb_policy/pick_first/pick_first.h',
+ 'src/core/ext/lb_policy/round_robin/round_robin.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',
@@ -262,7 +262,7 @@ Pod::Spec.new do |s|
  'src/core/lib/json/json_common.h',
  'src/core/lib/json/json_reader.h',
  'src/core/lib/json/json_writer.h',
- 'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
  'src/core/lib/security/auth_filters.h',
  'src/core/lib/security/b64.h',
  'src/core/lib/security/credentials.h',
@@ -362,9 +362,9 @@ Pod::Spec.new do |s|
  '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_policies/load_balancer_api.c',
- 'src/core/lib/client_config/lb_policies/pick_first.c',
- 'src/core/lib/client_config/lb_policies/round_robin.c',
+ 'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
+ 'src/core/ext/lb_policy/pick_first/pick_first.c',
+ 'src/core/ext/lb_policy/round_robin/round_robin.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',
@@ -430,7 +430,7 @@ Pod::Spec.new do |s|
  'src/core/lib/json/json_reader.c',
  'src/core/lib/json/json_string.c',
  'src/core/lib/json/json_writer.c',
- 'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/lib/security/b64.c',
  'src/core/lib/security/client_auth_filter.c',
  'src/core/lib/security/credentials.c',
@@ -531,9 +531,9 @@ Pod::Spec.new do |s|
  '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_policies/load_balancer_api.h',
- 'src/core/lib/client_config/lb_policies/pick_first.h',
- 'src/core/lib/client_config/lb_policies/round_robin.h',
+ 'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
+ 'src/core/ext/lb_policy/pick_first/pick_first.h',
+ 'src/core/ext/lb_policy/round_robin/round_robin.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',
@@ -593,7 +593,7 @@ Pod::Spec.new do |s|
  'src/core/lib/json/json_common.h',
  'src/core/lib/json/json_reader.h',
  'src/core/lib/json/json_writer.h',
- 'src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
  'src/core/lib/security/auth_filters.h',
  'src/core/lib/security/b64.h',
  'src/core/lib/security/credentials.h',