Optionalize name resolvers

narzolliam · Mar 31, 2016 · 65938df · 65938df
1 parent f3f099a
commit 65938df
Show file tree

Hide file tree

Showing 33 changed files with 167 additions and 277 deletions.
diff --git a/BUILD b/BUILD
@@ -208,8 +208,6 @@ cc_library(
  "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/resolvers/dns_resolver.h",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
  "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",
@@ -307,6 +305,8 @@ cc_library(
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
+ "src/core/ext/resolver/dns/native/dns_resolver.c",
+ "src/core/ext/resolver/sockaddr/sockaddr_resolver.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
  "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -351,8 +351,6 @@ cc_library(
  "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/resolvers/dns_resolver.c",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
  "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",
@@ -578,8 +576,6 @@ cc_library(
  "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/resolvers/dns_resolver.h",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
  "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",
@@ -663,6 +659,8 @@ cc_library(
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
+ "src/core/ext/resolver/dns/native/dns_resolver.c",
+ "src/core/ext/resolver/sockaddr/sockaddr_resolver.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
  "src/core/ext/transport/chttp2/transport/alpn.c",
@@ -705,8 +703,6 @@ cc_library(
  "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/resolvers/dns_resolver.c",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
  "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",
@@ -1372,6 +1368,8 @@ objc_library(
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
+ "src/core/ext/resolver/dns/native/dns_resolver.c",
+ "src/core/ext/resolver/sockaddr/sockaddr_resolver.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
  "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -1416,8 +1414,6 @@ objc_library(
  "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/resolvers/dns_resolver.c",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
  "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",
@@ -1585,8 +1581,6 @@ objc_library(
  "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/resolvers/dns_resolver.h",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
  "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",

diff --git a/Makefile b/Makefile
@@ -2453,6 +2453,8 @@ LIBGRPC_SRC = \
  src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
  src/core/ext/lb_policy/round_robin/round_robin.c \
+ src/core/ext/resolver/dns/native/dns_resolver.c \
+ src/core/ext/resolver/sockaddr/sockaddr_resolver.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \
  src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
@@ -2497,8 +2499,6 @@ LIBGRPC_SRC = \
  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/resolvers/dns_resolver.c \
- src/core/lib/client_config/resolvers/sockaddr_resolver.c \
  src/core/lib/client_config/subchannel.c \
  src/core/lib/client_config/subchannel_factory.c \
  src/core/lib/client_config/subchannel_index.c \
@@ -2815,6 +2815,8 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
  src/core/ext/lb_policy/round_robin/round_robin.c \
+ src/core/ext/resolver/dns/native/dns_resolver.c \
+ src/core/ext/resolver/sockaddr/sockaddr_resolver.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
  src/core/ext/transport/chttp2/transport/alpn.c \
@@ -2857,8 +2859,6 @@ LIBGRPC_UNSECURE_SRC = \
  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/resolvers/dns_resolver.c \
- src/core/lib/client_config/resolvers/sockaddr_resolver.c \
  src/core/lib/client_config/subchannel.c \
  src/core/lib/client_config/subchannel_factory.c \
  src/core/lib/client_config/subchannel_index.c \

diff --git a/binding.gyp b/binding.gyp
@@ -571,6 +571,8 @@
  'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/ext/lb_policy/pick_first/pick_first.c',
  'src/core/ext/lb_policy/round_robin/round_robin.c',
+ 'src/core/ext/resolver/dns/native/dns_resolver.c',
+ 'src/core/ext/resolver/sockaddr/sockaddr_resolver.c',
  'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
  'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
  'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
@@ -615,8 +617,6 @@
  '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/resolvers/dns_resolver.c',
- 'src/core/lib/client_config/resolvers/sockaddr_resolver.c',
  'src/core/lib/client_config/subchannel.c',
  'src/core/lib/client_config/subchannel_factory.c',
  'src/core/lib/client_config/subchannel_index.c',

diff --git a/build.yaml b/build.yaml
@@ -274,8 +274,6 @@ filegroups:
  - 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/resolvers/dns_resolver.h
- - src/core/lib/client_config/resolvers/sockaddr_resolver.h
  - src/core/lib/client_config/subchannel.h
  - src/core/lib/client_config/subchannel_factory.h
  - src/core/lib/client_config/subchannel_index.h
@@ -366,8 +364,6 @@ filegroups:
  - 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/resolvers/dns_resolver.c
- - src/core/lib/client_config/resolvers/sockaddr_resolver.c
  - src/core/lib/client_config/subchannel.c
  - src/core/lib/client_config/subchannel_factory.c
  - src/core/lib/client_config/subchannel_index.c
@@ -480,6 +476,18 @@ filegroups:
  plugin: grpc_lb_policy_round_robin
  uses:
  - grpc_base
+- name: grpc_resolver_dns_native
+ src:
+ - src/core/ext/resolver/dns/native/dns_resolver.c
+ plugin: grpc_resolver_dns_native
+ uses:
+ - grpc_base
+- name: grpc_resolver_sockaddr
+ src:
+ - src/core/ext/resolver/sockaddr/sockaddr_resolver.c
+ plugin: grpc_resolver_sockaddr
+ uses:
+ - grpc_base
 - name: grpc_secure
  headers:
  - src/core/lib/security/auth_filters.h
@@ -656,6 +664,8 @@ libs:
  - grpc_lb_policy_grpclb
  - grpc_lb_policy_pick_first
  - grpc_lb_policy_round_robin
+ - grpc_resolver_dns_native
+ - grpc_resolver_sockaddr
  - grpc_secure
  - grpc_codegen
  - census
@@ -740,6 +750,8 @@ libs:
  - grpc_base
  - grpc_transport_chttp2_server_insecure
  - grpc_transport_chttp2_client_insecure
+ - grpc_resolver_dns_native
+ - grpc_resolver_sockaddr
  - grpc_lb_policy_grpclb
  - grpc_lb_policy_pick_first
  - grpc_lb_policy_round_robin

diff --git a/config.m4 b/config.m4
@@ -93,6 +93,8 @@ if test "$PHP_GRPC" != "no"; then
  src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
  src/core/ext/lb_policy/round_robin/round_robin.c \
+ src/core/ext/resolver/dns/native/dns_resolver.c \
+ src/core/ext/resolver/sockaddr/sockaddr_resolver.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \
  src/core/ext/transport/chttp2/client/secure/secure_channel_create.c \
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
@@ -137,8 +139,6 @@ if test "$PHP_GRPC" != "no"; then
  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/resolvers/dns_resolver.c \
- src/core/lib/client_config/resolvers/sockaddr_resolver.c \
  src/core/lib/client_config/subchannel.c \
  src/core/lib/client_config/subchannel_factory.c \
  src/core/lib/client_config/subchannel_index.c \
@@ -552,14 +552,15 @@ if test "$PHP_GRPC" != "no"; then
  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)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/round_robin)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/resolver/dns/native)
+ PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/resolver/sockaddr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/insecure)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/secure)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/insecure)
  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/client_config/resolvers)
  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
@@ -210,8 +210,6 @@ Pod::Spec.new do |s|
  '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/resolvers/dns_resolver.h',
- 'src/core/lib/client_config/resolvers/sockaddr_resolver.h',
  'src/core/lib/client_config/subchannel.h',
  'src/core/lib/client_config/subchannel_factory.h',
  'src/core/lib/client_config/subchannel_index.h',
@@ -326,6 +324,8 @@ Pod::Spec.new do |s|
  'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/ext/lb_policy/pick_first/pick_first.c',
  'src/core/ext/lb_policy/round_robin/round_robin.c',
+ 'src/core/ext/resolver/dns/native/dns_resolver.c',
+ 'src/core/ext/resolver/sockaddr/sockaddr_resolver.c',
  'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
  'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c',
  'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
@@ -370,8 +370,6 @@ Pod::Spec.new do |s|
  '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/resolvers/dns_resolver.c',
- 'src/core/lib/client_config/resolvers/sockaddr_resolver.c',
  'src/core/lib/client_config/subchannel.c',
  'src/core/lib/client_config/subchannel_factory.c',
  'src/core/lib/client_config/subchannel_index.c',
@@ -540,8 +538,6 @@ Pod::Spec.new do |s|
  '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/resolvers/dns_resolver.h',
- 'src/core/lib/client_config/resolvers/sockaddr_resolver.h',
  'src/core/lib/client_config/subchannel.h',
  'src/core/lib/client_config/subchannel_factory.h',
  'src/core/lib/client_config/subchannel_index.h',

diff --git a/grpc.gemspec b/grpc.gemspec
@@ -206,8 +206,6 @@ Gem::Specification.new do |s|
  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/resolvers/dns_resolver.h )
- s.files += %w( src/core/lib/client_config/resolvers/sockaddr_resolver.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 )
@@ -309,6 +307,8 @@ Gem::Specification.new do |s|
  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 )
  s.files += %w( src/core/ext/lb_policy/round_robin/round_robin.c )
+ s.files += %w( src/core/ext/resolver/dns/native/dns_resolver.c )
+ s.files += %w( src/core/ext/resolver/sockaddr/sockaddr_resolver.c )
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c )
  s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.c )
  s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c )
@@ -353,8 +353,6 @@ Gem::Specification.new do |s|
  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/resolvers/dns_resolver.c )
- s.files += %w( src/core/lib/client_config/resolvers/sockaddr_resolver.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 )

diff --git a/package.json b/package.json
@@ -149,8 +149,6 @@
  "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/resolvers/dns_resolver.h",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.h",
  "src/core/lib/client_config/subchannel.h",
  "src/core/lib/client_config/subchannel_factory.h",
  "src/core/lib/client_config/subchannel_index.h",
@@ -252,6 +250,8 @@
  "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
+ "src/core/ext/resolver/dns/native/dns_resolver.c",
+ "src/core/ext/resolver/sockaddr/sockaddr_resolver.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
  "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -296,8 +296,6 @@
  "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/resolvers/dns_resolver.c",
- "src/core/lib/client_config/resolvers/sockaddr_resolver.c",
  "src/core/lib/client_config/subchannel.c",
  "src/core/lib/client_config/subchannel_factory.c",
  "src/core/lib/client_config/subchannel_index.c",

diff --git a/package.xml b/package.xml
@@ -210,8 +210,6 @@
  <file baseinstalldir="/" name="src/core/lib/client_config/resolver.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/resolver_factory.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/resolver_registry.h" role="src" />
- <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/dns_resolver.h" role="src" />
- <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/sockaddr_resolver.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_factory.h" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_index.h" role="src" />
@@ -313,6 +311,8 @@
  <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/pick_first/pick_first.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/round_robin/round_robin.c" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/resolver/dns/native/dns_resolver.c" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/resolver/sockaddr/sockaddr_resolver.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.c" role="src" />
@@ -357,8 +357,6 @@
  <file baseinstalldir="/" name="src/core/lib/client_config/resolver.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/resolver_factory.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/resolver_registry.c" role="src" />
- <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/dns_resolver.c" role="src" />
- <file baseinstalldir="/" name="src/core/lib/client_config/resolvers/sockaddr_resolver.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_factory.c" role="src" />
  <file baseinstalldir="/" name="src/core/lib/client_config/subchannel_index.c" role="src" />

diff --git a/src/core/ext/resolver/dns/native/README.md b/src/core/ext/resolver/dns/native/README.md
@@ -0,0 +1,2 @@
+dns: scheme name resolution, using getaddrbyname
+(or other OS specific implementation)