From 2a41d41076e76f208bfd5e1a626c6183e71ac401 Mon Sep 17 00:00:00 2001 From: ctiller Date: Sun, 28 Jan 2024 17:06:05 +0000 Subject: [PATCH] Automated change: Fix sanity tests --- CMakeLists.txt | 3 +++ Makefile | 2 ++ Package.swift | 2 ++ build_autogenerated.yaml | 6 ++++++ config.m4 | 1 + config.w32 | 1 + gRPC-C++.podspec | 2 ++ gRPC-Core.podspec | 3 +++ grpc.gemspec | 2 ++ grpc.gyp | 3 +++ package.xml | 2 ++ src/core/lib/transport/call_spine.cc | 2 ++ src/core/lib/transport/call_spine.h | 4 +++- src/python/grpcio/grpc_core_dependencies.py | 1 + tools/doxygen/Doxyfile.c++.internal | 2 ++ tools/doxygen/Doxyfile.core.internal | 2 ++ 16 files changed, 37 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31334215ff9..539fb5cb73e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2528,6 +2528,7 @@ add_library(grpc src/core/lib/transport/bdp_estimator.cc src/core/lib/transport/call_filters.cc src/core/lib/transport/call_final_info.cc + src/core/lib/transport/call_spine.cc src/core/lib/transport/connectivity_state.cc src/core/lib/transport/error_utils.cc src/core/lib/transport/handshaker.cc @@ -3243,6 +3244,7 @@ add_library(grpc_unsecure src/core/lib/transport/bdp_estimator.cc src/core/lib/transport/call_filters.cc src/core/lib/transport/call_final_info.cc + src/core/lib/transport/call_spine.cc src/core/lib/transport/connectivity_state.cc src/core/lib/transport/error_utils.cc src/core/lib/transport/handshaker.cc @@ -5330,6 +5332,7 @@ add_library(grpc_authorization_provider src/core/lib/transport/batch_builder.cc src/core/lib/transport/call_filters.cc src/core/lib/transport/call_final_info.cc + src/core/lib/transport/call_spine.cc src/core/lib/transport/connectivity_state.cc src/core/lib/transport/error_utils.cc src/core/lib/transport/handshaker.cc diff --git a/Makefile b/Makefile index a07741e841f..b857b96f504 100644 --- a/Makefile +++ b/Makefile @@ -1710,6 +1710,7 @@ LIBGRPC_SRC = \ src/core/lib/transport/bdp_estimator.cc \ src/core/lib/transport/call_filters.cc \ src/core/lib/transport/call_final_info.cc \ + src/core/lib/transport/call_spine.cc \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/handshaker.cc \ @@ -2259,6 +2260,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/transport/bdp_estimator.cc \ src/core/lib/transport/call_filters.cc \ src/core/lib/transport/call_final_info.cc \ + src/core/lib/transport/call_spine.cc \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/handshaker.cc \ diff --git a/Package.swift b/Package.swift index cf59d4d2e6f..16a12d054f8 100644 --- a/Package.swift +++ b/Package.swift @@ -1903,6 +1903,8 @@ let package = Package( "src/core/lib/transport/call_filters.h", "src/core/lib/transport/call_final_info.cc", "src/core/lib/transport/call_final_info.h", + "src/core/lib/transport/call_spine.cc", + "src/core/lib/transport/call_spine.h", "src/core/lib/transport/connectivity_state.cc", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/custom_metadata.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 52a7b9a5c87..634658fae83 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1179,6 +1179,7 @@ libs: - src/core/lib/transport/bdp_estimator.h - src/core/lib/transport/call_filters.h - src/core/lib/transport/call_final_info.h + - src/core/lib/transport/call_spine.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - src/core/lib/transport/error_utils.h @@ -1982,6 +1983,7 @@ libs: - src/core/lib/transport/bdp_estimator.cc - src/core/lib/transport/call_filters.cc - src/core/lib/transport/call_final_info.cc + - src/core/lib/transport/call_spine.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc @@ -2628,6 +2630,7 @@ libs: - src/core/lib/transport/bdp_estimator.h - src/core/lib/transport/call_filters.h - src/core/lib/transport/call_final_info.h + - src/core/lib/transport/call_spine.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - src/core/lib/transport/error_utils.h @@ -3047,6 +3050,7 @@ libs: - src/core/lib/transport/bdp_estimator.cc - src/core/lib/transport/call_filters.cc - src/core/lib/transport/call_final_info.cc + - src/core/lib/transport/call_spine.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc @@ -4669,6 +4673,7 @@ libs: - src/core/lib/transport/batch_builder.h - src/core/lib/transport/call_filters.h - src/core/lib/transport/call_final_info.h + - src/core/lib/transport/call_spine.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - src/core/lib/transport/error_utils.h @@ -4965,6 +4970,7 @@ libs: - src/core/lib/transport/batch_builder.cc - src/core/lib/transport/call_filters.cc - src/core/lib/transport/call_final_info.cc + - src/core/lib/transport/call_spine.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc diff --git a/config.m4 b/config.m4 index 1538009a4f4..89713d1a315 100644 --- a/config.m4 +++ b/config.m4 @@ -838,6 +838,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/transport/bdp_estimator.cc \ src/core/lib/transport/call_filters.cc \ src/core/lib/transport/call_final_info.cc \ + src/core/lib/transport/call_spine.cc \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/handshaker.cc \ diff --git a/config.w32 b/config.w32 index 95fb787dae8..0b6600482bd 100644 --- a/config.w32 +++ b/config.w32 @@ -803,6 +803,7 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\transport\\bdp_estimator.cc " + "src\\core\\lib\\transport\\call_filters.cc " + "src\\core\\lib\\transport\\call_final_info.cc " + + "src\\core\\lib\\transport\\call_spine.cc " + "src\\core\\lib\\transport\\connectivity_state.cc " + "src\\core\\lib\\transport\\error_utils.cc " + "src\\core\\lib\\transport\\handshaker.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 57ebb666793..cb91126225b 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1283,6 +1283,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/bdp_estimator.h', 'src/core/lib/transport/call_filters.h', 'src/core/lib/transport/call_final_info.h', + 'src/core/lib/transport/call_spine.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', @@ -2537,6 +2538,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/bdp_estimator.h', 'src/core/lib/transport/call_filters.h', 'src/core/lib/transport/call_final_info.h', + 'src/core/lib/transport/call_spine.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 1193cdeaeda..8c5a7ffec9d 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -2012,6 +2012,8 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_filters.h', 'src/core/lib/transport/call_final_info.cc', 'src/core/lib/transport/call_final_info.h', + 'src/core/lib/transport/call_spine.cc', + 'src/core/lib/transport/call_spine.h', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', @@ -3314,6 +3316,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/bdp_estimator.h', 'src/core/lib/transport/call_filters.h', 'src/core/lib/transport/call_final_info.h', + 'src/core/lib/transport/call_spine.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', diff --git a/grpc.gemspec b/grpc.gemspec index e3e58357291..dd2024bb35e 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1905,6 +1905,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/call_filters.h ) s.files += %w( src/core/lib/transport/call_final_info.cc ) s.files += %w( src/core/lib/transport/call_final_info.h ) + s.files += %w( src/core/lib/transport/call_spine.cc ) + s.files += %w( src/core/lib/transport/call_spine.h ) s.files += %w( src/core/lib/transport/connectivity_state.cc ) s.files += %w( src/core/lib/transport/connectivity_state.h ) s.files += %w( src/core/lib/transport/custom_metadata.h ) diff --git a/grpc.gyp b/grpc.gyp index 4ffc196c1d6..6a86620aeee 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -1024,6 +1024,7 @@ 'src/core/lib/transport/bdp_estimator.cc', 'src/core/lib/transport/call_filters.cc', 'src/core/lib/transport/call_final_info.cc', + 'src/core/lib/transport/call_spine.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', @@ -1513,6 +1514,7 @@ 'src/core/lib/transport/bdp_estimator.cc', 'src/core/lib/transport/call_filters.cc', 'src/core/lib/transport/call_final_info.cc', + 'src/core/lib/transport/call_spine.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', @@ -2282,6 +2284,7 @@ 'src/core/lib/transport/batch_builder.cc', 'src/core/lib/transport/call_filters.cc', 'src/core/lib/transport/call_final_info.cc', + 'src/core/lib/transport/call_spine.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', diff --git a/package.xml b/package.xml index 0e91f6f4f56..75bfae51bd7 100644 --- a/package.xml +++ b/package.xml @@ -1887,6 +1887,8 @@ + + diff --git a/src/core/lib/transport/call_spine.cc b/src/core/lib/transport/call_spine.cc index ba5c8b34d96..78e2aca797c 100644 --- a/src/core/lib/transport/call_spine.cc +++ b/src/core/lib/transport/call_spine.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/lib/transport/call_spine.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index 050cbe21d5f..d25ba239f48 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H +#include + #include #include "src/core/lib/promise/detail/status.h" @@ -413,4 +415,4 @@ void ForwardCall(CallHandler call_handler, CallInitiator call_initiator, } // namespace grpc_core -#endif +#endif // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 3f63633766f..7c4a43be9ca 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -812,6 +812,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/bdp_estimator.cc', 'src/core/lib/transport/call_filters.cc', 'src/core/lib/transport/call_final_info.cc', + 'src/core/lib/transport/call_spine.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 3b0353e91a9..320cfe8c255 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2904,6 +2904,8 @@ src/core/lib/transport/call_filters.cc \ src/core/lib/transport/call_filters.h \ src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/call_final_info.h \ +src/core/lib/transport/call_spine.cc \ +src/core/lib/transport/call_spine.h \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/connectivity_state.h \ src/core/lib/transport/custom_metadata.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 244a3e18d5d..4cc0d41398b 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2685,6 +2685,8 @@ src/core/lib/transport/call_filters.cc \ src/core/lib/transport/call_filters.h \ src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/call_final_info.h \ +src/core/lib/transport/call_spine.cc \ +src/core/lib/transport/call_spine.h \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/connectivity_state.h \ src/core/lib/transport/custom_metadata.h \