Move channel_filter.h from include/ tree to src/ tree.

BUILD

@@ -1224,6 +1224,7 @@ cc_library(
     "src/cpp/common/secure_auth_context.h",
     "src/cpp/server/secure_server_credentials.h",
     "src/cpp/client/create_channel_internal.h",
+    "src/cpp/common/channel_filter.h",
     "src/cpp/server/dynamic_thread_pool.h",
     "src/cpp/server/thread_pool_interface.h",
     "src/cpp/client/secure_credentials.cc",
@@ -1264,7 +1265,6 @@ cc_library(
   hdrs = [
     "include/grpc++/alarm.h",
     "include/grpc++/channel.h",
-    "include/grpc++/channel_filter.h",
     "include/grpc++/client_context.h",
     "include/grpc++/completion_queue.h",
     "include/grpc++/create_channel.h",
@@ -1457,6 +1457,7 @@ cc_library(
   name = "grpc++_unsecure",
   srcs = [
     "src/cpp/client/create_channel_internal.h",
+    "src/cpp/common/channel_filter.h",
     "src/cpp/server/dynamic_thread_pool.h",
     "src/cpp/server/thread_pool_interface.h",
     "src/cpp/common/insecure_create_auth_context.cc",
@@ -1492,7 +1493,6 @@ cc_library(
   hdrs = [
     "include/grpc++/alarm.h",
     "include/grpc++/channel.h",
-    "include/grpc++/channel_filter.h",
     "include/grpc++/client_context.h",
     "include/grpc++/completion_queue.h",
     "include/grpc++/create_channel.h",

Makefile

@@ -1489,6 +1489,7 @@ buildtests_cxx: buildtests_zookeeper privatelibs_cxx \
   $(BINDIR)/$(CONFIG)/cxx_string_ref_test \
   $(BINDIR)/$(CONFIG)/cxx_time_test \
   $(BINDIR)/$(CONFIG)/end2end_test \
+  $(BINDIR)/$(CONFIG)/filter_end2end_test \
   $(BINDIR)/$(CONFIG)/generic_end2end_test \
   $(BINDIR)/$(CONFIG)/golden_file_test \
   $(BINDIR)/$(CONFIG)/grpc_cli \
@@ -3497,7 +3498,6 @@ LIBGRPC++_SRC = \
 PUBLIC_HEADERS_CXX += \
     include/grpc++/alarm.h \
     include/grpc++/channel.h \
-    include/grpc++/channel_filter.h \
     include/grpc++/client_context.h \
     include/grpc++/completion_queue.h \
     include/grpc++/create_channel.h \
@@ -3986,7 +3986,6 @@ LIBGRPC++_UNSECURE_SRC = \
 PUBLIC_HEADERS_CXX += \
     include/grpc++/alarm.h \
     include/grpc++/channel.h \
-    include/grpc++/channel_filter.h \
     include/grpc++/client_context.h \
     include/grpc++/completion_queue.h \
     include/grpc++/create_channel.h \

build.yaml

@@ -638,7 +638,6 @@ filegroups:
   public_headers:
   - include/grpc++/alarm.h
   - include/grpc++/channel.h
-  - include/grpc++/channel_filter.h
   - include/grpc++/client_context.h
   - include/grpc++/completion_queue.h
   - include/grpc++/create_channel.h
@@ -686,6 +685,7 @@ filegroups:
   - include/grpc++/support/time.h
   headers:
   - src/cpp/client/create_channel_internal.h
+  - src/cpp/common/channel_filter.h
   - src/cpp/server/dynamic_thread_pool.h
   - src/cpp/server/thread_pool_interface.h
   src:

src/cpp/common/channel_filter.cc

@@ -31,11 +31,10 @@
  *
  */
 
-#include <grpc++/channel_filter.h>
-
 #include <string.h>
 
 #include "src/core/lib/channel/channel_stack.h"
+#include "src/cpp/common/channel_filter.h"
 
 namespace grpc {
 

include/grpc++/channel_filter.h → src/cpp/common/channel_filter.h

@@ -122,7 +122,7 @@ class TransportOp {
 
   grpc_transport_op *op() const { return op_; }
 
-  // FIXME: add a C++ wrapper for grpc_error?
+  // TODO(roth): Add a C++ wrapper for grpc_error?
   grpc_error *disconnect_with_error() const {
     return op_->disconnect_with_error;
   }
@@ -211,8 +211,7 @@ class ChannelData {
 
   const char *peer() const { return peer_; }
 
-  // FIXME: find a way to avoid passing elem into these methods
-  // (same for CallData below)
+  // TODO(roth): Find a way to avoid passing elem into these methods.
   virtual void StartTransportOp(grpc_exec_ctx *exec_ctx,
                                 grpc_channel_element *elem, TransportOp *op);
 
@@ -230,6 +229,8 @@ class CallData {
 
   virtual grpc_error *Init() { return GRPC_ERROR_NONE; }
 
+  // TODO(roth): Find a way to avoid passing elem into these methods.
+
   virtual void StartTransportStreamOp(grpc_exec_ctx *exec_ctx,
                                       grpc_call_element *elem,
                                       TransportStreamOp *op);

test/cpp/end2end/filter_end2end_test.cc

@@ -35,7 +35,6 @@
 #include <mutex>
 
 #include <grpc++/channel.h>
-#include <grpc++/channel_filter.h>
 #include <grpc++/client_context.h>
 #include <grpc++/create_channel.h>
 #include <grpc++/generic/async_generic_service.h>
@@ -50,6 +49,7 @@
 #include <grpc/support/time.h>
 #include <gtest/gtest.h>
 
+#include "src/cpp/common/channel_filter.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"

tools/doxygen/Doxyfile.c++

@@ -762,7 +762,6 @@ WARN_LOGFILE           =
 
 INPUT                  = include/grpc++/alarm.h \
 include/grpc++/channel.h \
-include/grpc++/channel_filter.h \
 include/grpc++/client_context.h \
 include/grpc++/completion_queue.h \
 include/grpc++/create_channel.h \

tools/doxygen/Doxyfile.c++.internal

@@ -762,7 +762,6 @@ WARN_LOGFILE           =
 
 INPUT                  = include/grpc++/alarm.h \
 include/grpc++/channel.h \
-include/grpc++/channel_filter.h \
 include/grpc++/client_context.h \
 include/grpc++/completion_queue.h \
 include/grpc++/create_channel.h \
@@ -864,6 +863,7 @@ src/cpp/client/secure_credentials.h \
 src/cpp/common/secure_auth_context.h \
 src/cpp/server/secure_server_credentials.h \
 src/cpp/client/create_channel_internal.h \
+src/cpp/common/channel_filter.h \
 src/cpp/server/dynamic_thread_pool.h \
 src/cpp/server/thread_pool_interface.h \
 src/cpp/client/secure_credentials.cc \

tools/run_tests/sources_and_headers.json

@@ -6537,7 +6537,6 @@
     "headers": [
       "include/grpc++/alarm.h", 
       "include/grpc++/channel.h", 
-      "include/grpc++/channel_filter.h", 
       "include/grpc++/client_context.h", 
       "include/grpc++/completion_queue.h", 
       "include/grpc++/create_channel.h", 
@@ -6584,6 +6583,7 @@
       "include/grpc++/support/sync_stream.h", 
       "include/grpc++/support/time.h", 
       "src/cpp/client/create_channel_internal.h", 
+      "src/cpp/common/channel_filter.h", 
       "src/cpp/server/dynamic_thread_pool.h", 
       "src/cpp/server/thread_pool_interface.h"
     ], 
@@ -6592,7 +6592,6 @@
     "src": [
       "include/grpc++/alarm.h", 
       "include/grpc++/channel.h", 
-      "include/grpc++/channel_filter.h", 
       "include/grpc++/client_context.h", 
       "include/grpc++/completion_queue.h", 
       "include/grpc++/create_channel.h", 
@@ -6649,6 +6648,7 @@
       "src/cpp/client/insecure_credentials.cc", 
       "src/cpp/common/channel_arguments.cc", 
       "src/cpp/common/channel_filter.cc", 
+      "src/cpp/common/channel_filter.h", 
       "src/cpp/common/completion_queue.cc", 
       "src/cpp/common/core_codegen.cc", 
       "src/cpp/common/rpc_method.cc", 

vsprojects/vcxproj/grpc++/grpc++.vcxproj

@@ -260,7 +260,6 @@
   <ItemGroup>
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\alarm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel_filter.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\client_context.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\completion_queue.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\create_channel.h" />
@@ -364,6 +363,7 @@
     <ClInclude Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.h" />
     <ClInclude Include="$(SolutionDir)\..\src\cpp\server\secure_server_credentials.h" />
     <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h" />
     <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h" />
     <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h" />
   </ItemGroup>

vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters

@@ -111,9 +111,6 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel_filter.h">
-      <Filter>include\grpc++</Filter>
-    </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\client_context.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
@@ -419,6 +416,9 @@
     <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h">
       <Filter>src\cpp\client</Filter>
     </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h">
+      <Filter>src\cpp\common</Filter>
+    </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h">
       <Filter>src\cpp\server</Filter>
     </ClInclude>

vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj

@@ -260,7 +260,6 @@
   <ItemGroup>
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\alarm.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel_filter.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\client_context.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\completion_queue.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\create_channel.h" />
@@ -360,6 +359,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h" />
     <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h" />
     <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h" />
   </ItemGroup>

vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters

@@ -96,9 +96,6 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\channel_filter.h">
-      <Filter>include\grpc++</Filter>
-    </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\client_context.h">
       <Filter>include\grpc++</Filter>
     </ClInclude>
@@ -392,6 +389,9 @@
     <ClInclude Include="$(SolutionDir)\..\src\cpp\client\create_channel_internal.h">
       <Filter>src\cpp\client</Filter>
     </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\cpp\common\channel_filter.h">
+      <Filter>src\cpp\common</Filter>
+    </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\src\cpp\server\dynamic_thread_pool.h">
       <Filter>src\cpp\server</Filter>
     </ClInclude>