Move subchannel_call_holder

9 years ago · b112f3989f
parent 52c85cecf3
commit b112f3989f
19 changed files with 50 additions and 50 deletions
--- a/12
+++ b/12
@ -177,6 +177,7 @@ cc_library(
    "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_call_holder.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",
@ -210,7 +211,6 @@ cc_library(
    "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/compression/algorithm_metadata.h",
    "src/core/lib/compression/message_compress.h",
    "src/core/lib/debug/trace.h",
@ -313,6 +313,7 @@ cc_library(
    "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_call_holder.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",
@ -353,7 +354,6 @@ cc_library(
    "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/compression/compression_algorithm.c",
    "src/core/lib/compression/message_compress.c",
    "src/core/lib/debug/trace.c",
@ -540,6 +540,7 @@ cc_library(
    "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_call_holder.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",
@ -573,7 +574,6 @@ cc_library(
    "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/compression/algorithm_metadata.h",
    "src/core/lib/compression/message_compress.h",
    "src/core/lib/debug/trace.h",
@ -662,6 +662,7 @@ cc_library(
    "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_call_holder.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",
@ -700,7 +701,6 @@ cc_library(
    "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/compression/compression_algorithm.c",
    "src/core/lib/compression/message_compress.c",
    "src/core/lib/debug/trace.c",
@ -1367,6 +1367,7 @@ objc_library(
    "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_call_holder.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",
@ -1407,7 +1408,6 @@ objc_library(
    "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/compression/compression_algorithm.c",
    "src/core/lib/compression/message_compress.c",
    "src/core/lib/debug/trace.c",
@ -1536,6 +1536,7 @@ objc_library(
    "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_call_holder.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",
@ -1569,7 +1570,6 @@ objc_library(
    "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/compression/algorithm_metadata.h",
    "src/core/lib/compression/message_compress.h",
    "src/core/lib/debug/trace.h",
--- a/4
+++ b/4
@ -2461,6 +2461,7 @@ LIBGRPC_SRC = \
    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_call_holder.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 \
@ -2501,7 +2502,6 @@ LIBGRPC_SRC = \
    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/compression/compression_algorithm.c \
    src/core/lib/compression/message_compress.c \
    src/core/lib/debug/trace.c \
@ -2820,6 +2820,7 @@ LIBGRPC_UNSECURE_SRC = \
    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_call_holder.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 \
@ -2858,7 +2859,6 @@ LIBGRPC_UNSECURE_SRC = \
    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/compression/compression_algorithm.c \
    src/core/lib/compression/message_compress.c \
    src/core/lib/debug/trace.c \
--- a/binding.gyp
+++ b/binding.gyp
@ -581,6 +581,7 @@
        '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_call_holder.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',
@ -621,7 +622,6 @@
        '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/compression/compression_algorithm.c',
        'src/core/lib/compression/message_compress.c',
        'src/core/lib/debug/trace.c',
--- a/build.yaml
+++ b/build.yaml
@ -262,7 +262,6 @@ filegroups:
  - 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/compression/algorithm_metadata.h
  - src/core/lib/compression/message_compress.h
  - src/core/lib/debug/trace.h
@ -336,7 +335,6 @@ filegroups:
  - 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/compression/compression_algorithm.c
  - src/core/lib/compression/message_compress.c
  - src/core/lib/debug/trace.c
@ -426,6 +424,7 @@ filegroups:
  - 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_call_holder.h
  - src/core/ext/client_config/subchannel_index.h
  - src/core/ext/client_config/uri_parser.h
  src:
@ -443,6 +442,7 @@ filegroups:
  - 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_call_holder.c
  - src/core/ext/client_config/subchannel_index.c
  - src/core/ext/client_config/uri_parser.c
 - name: grpc_codegen
--- a/config.m4
+++ b/config.m4
@ -103,6 +103,7 @@ if test "$PHP_GRPC" != "no"; then
    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_call_holder.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 \
@ -143,7 +144,6 @@ if test "$PHP_GRPC" != "no"; then
    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/compression/compression_algorithm.c \
    src/core/lib/compression/message_compress.c \
    src/core/lib/debug/trace.c \
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -179,6 +179,7 @@ Pod::Spec.new do |s|
                      '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_call_holder.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',
@ -212,7 +213,6 @@ Pod::Spec.new do |s|
                      '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/compression/algorithm_metadata.h',
                      'src/core/lib/compression/message_compress.h',
                      'src/core/lib/debug/trace.h',
@ -332,6 +332,7 @@ Pod::Spec.new do |s|
                      '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_call_holder.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',
@ -372,7 +373,6 @@ Pod::Spec.new do |s|
                      '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/compression/compression_algorithm.c',
                      'src/core/lib/compression/message_compress.c',
                      'src/core/lib/debug/trace.c',
@ -502,6 +502,7 @@ Pod::Spec.new do |s|
                              '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_call_holder.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',
@ -535,7 +536,6 @@ Pod::Spec.new do |s|
                              '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/compression/algorithm_metadata.h',
                              'src/core/lib/compression/message_compress.h',
                              'src/core/lib/debug/trace.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -175,6 +175,7 @@ Gem::Specification.new do |s|
  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_call_holder.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 )
@ -208,7 +209,6 @@ Gem::Specification.new do |s|
  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/compression/algorithm_metadata.h )
  s.files += %w( src/core/lib/compression/message_compress.h )
  s.files += %w( src/core/lib/debug/trace.h )
@ -315,6 +315,7 @@ Gem::Specification.new do |s|
  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_call_holder.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 )
@ -355,7 +356,6 @@ Gem::Specification.new do |s|
  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/compression/compression_algorithm.c )
  s.files += %w( src/core/lib/compression/message_compress.c )
  s.files += %w( src/core/lib/debug/trace.c )
--- a/package.json
+++ b/package.json
@ -118,6 +118,7 @@
    "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_call_holder.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",
@ -151,7 +152,6 @@
    "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/compression/algorithm_metadata.h",
    "src/core/lib/compression/message_compress.h",
    "src/core/lib/debug/trace.h",
@ -258,6 +258,7 @@
    "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_call_holder.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",
@ -298,7 +299,6 @@
    "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/compression/compression_algorithm.c",
    "src/core/lib/compression/message_compress.c",
    "src/core/lib/debug/trace.c",
--- a/package.xml
+++ b/package.xml
@ -179,6 +179,7 @@
    <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_call_holder.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" />
@ -212,7 +213,6 @@
    <file baseinstalldir="/" name="src/core/lib/channel/context.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/http_client_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/http_server_filter.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/subchannel_call_holder.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/algorithm_metadata.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/message_compress.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/debug/trace.h" role="src" />
@ -319,6 +319,7 @@
    <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_call_holder.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" />
@ -359,7 +360,6 @@
    <file baseinstalldir="/" name="src/core/lib/channel/connected_channel.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/http_client_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/http_server_filter.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/subchannel_call_holder.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/compression_algorithm.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/compression/message_compress.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/debug/trace.c" role="src" />
--- a/src/core/ext/client_config/client_channel.c
+++ b/src/core/ext/client_config/client_channel.c
@ -43,7 +43,7 @@

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/connected_channel.h"
-#include "src/core/lib/channel/subchannel_call_holder.h"
+#include "src/core/ext/client_config/subchannel_call_holder.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/profiling/timers.h"
 #include "src/core/lib/support/string.h"
--- a/src/core/ext/client_config/subchannel_call_holder.c
+++ b/src/core/ext/client_config/subchannel_call_holder.c
@ -31,7 +31,7 @@
 *
 */

-#include "src/core/lib/channel/subchannel_call_holder.h"
+#include "src/core/ext/client_config/subchannel_call_holder.h"

 #include <grpc/support/alloc.h>

--- a/src/core/ext/client_config/subchannel_call_holder.h
+++ b/src/core/ext/client_config/subchannel_call_holder.h
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -97,6 +97,7 @@ CORE_SOURCE_FILES = [
  '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_call_holder.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',
@ -137,7 +138,6 @@ CORE_SOURCE_FILES = [
  '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/compression/compression_algorithm.c',
  'src/core/lib/compression/message_compress.c',
  'src/core/lib/debug/trace.c',
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -791,6 +791,7 @@ 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_call_holder.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 \
@ -824,7 +825,6 @@ 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/compression/algorithm_metadata.h \
 src/core/lib/compression/message_compress.h \
 src/core/lib/debug/trace.h \
@ -931,6 +931,7 @@ 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_call_holder.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 \
@ -971,7 +972,6 @@ 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/compression/compression_algorithm.c \
 src/core/lib/compression/message_compress.c \
 src/core/lib/debug/trace.c \
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@ -4019,6 +4019,7 @@
      "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_call_holder.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", 
@ -4052,7 +4053,6 @@
      "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/compression/algorithm_metadata.h", 
      "src/core/lib/compression/message_compress.h", 
      "src/core/lib/debug/trace.h", 
@ -4194,6 +4194,8 @@
      "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_call_holder.c", 
+      "src/core/ext/client_config/subchannel_call_holder.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", 
@ -4267,8 +4269,6 @@
      "src/core/lib/channel/http_client_filter.h", 
      "src/core/lib/channel/http_server_filter.c", 
      "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/compression/algorithm_metadata.h", 
      "src/core/lib/compression/compression_algorithm.c", 
      "src/core/lib/compression/message_compress.c", 
@ -4633,6 +4633,7 @@
      "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_call_holder.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", 
@ -4666,7 +4667,6 @@
      "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/compression/algorithm_metadata.h", 
      "src/core/lib/compression/message_compress.h", 
      "src/core/lib/debug/trace.h", 
@ -4793,6 +4793,8 @@
      "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_call_holder.c", 
+      "src/core/ext/client_config/subchannel_call_holder.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", 
@ -4864,8 +4866,6 @@
      "src/core/lib/channel/http_client_filter.h", 
      "src/core/lib/channel/http_server_filter.c", 
      "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/compression/algorithm_metadata.h", 
      "src/core/lib/compression/compression_algorithm.c", 
      "src/core/lib/compression/message_compress.c", 
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@ -300,6 +300,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
@ -333,7 +334,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\context.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\debug\trace.h" />
@ -465,6 +465,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c">
@ -545,8 +547,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\compression_algorithm.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.c">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@ -70,6 +70,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
      <Filter>src\core\ext\client_config</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c">
+      <Filter>src\core\ext\client_config</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
      <Filter>src\core\ext\client_config</Filter>
    </ClCompile>
@ -190,9 +193,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
-      <Filter>src\core\lib\channel</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\compression_algorithm.c">
      <Filter>src\core\lib\compression</Filter>
    </ClCompile>
@ -584,6 +584,9 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h">
      <Filter>src\core\ext\client_config</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h">
+      <Filter>src\core\ext\client_config</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h">
      <Filter>src\core\ext\client_config</Filter>
    </ClInclude>
@ -683,9 +686,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h">
-      <Filter>src\core\lib\channel</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h">
      <Filter>src\core\lib\compression</Filter>
    </ClInclude>
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@ -290,6 +290,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_factory.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
@ -323,7 +324,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\context.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_client_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\debug\trace.h" />
@ -441,6 +441,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\uri_parser.c">
@ -517,8 +519,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\compression_algorithm.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\message_compress.c">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@ -70,6 +70,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c">
      <Filter>src\core\ext\client_config</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c">
+      <Filter>src\core\ext\client_config</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c">
      <Filter>src\core\ext\client_config</Filter>
    </ClCompile>
@ -184,9 +187,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.c">
-      <Filter>src\core\lib\channel</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\compression\compression_algorithm.c">
      <Filter>src\core\lib\compression</Filter>
    </ClCompile>
@ -521,6 +521,9 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h">
      <Filter>src\core\ext\client_config</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h">
+      <Filter>src\core\ext\client_config</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h">
      <Filter>src\core\ext\client_config</Filter>
    </ClInclude>
@ -620,9 +623,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\http_server_filter.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\subchannel_call_holder.h">
-      <Filter>src\core\lib\channel</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\compression\algorithm_metadata.h">
      <Filter>src\core\lib\compression</Filter>
    </ClInclude>