From 461bb5e41f28354ca19b116e04b53a751171fd31 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 18 Nov 2021 16:24:44 -0800 Subject: [PATCH] To LTS 20211102.0 (#27916) --- CMakeLists.txt | 10 +- Makefile | 11 +- bazel/grpc_deps.bzl | 8 +- config.m4 | 12 +- config.w32 | 13 +- gRPC-C++.podspec | 2 +- gRPC-Core.podspec | 2 +- grpc.gemspec | 29 +++- package.xml | 29 +++- src/abseil-cpp/preprocessed_builds.yaml | 169 +++++++++++++++++--- src/python/grpcio/grpc_core_dependencies.py | 11 +- templates/gRPC-C++.podspec.template | 2 +- templates/gRPC-Core.podspec.template | 2 +- third_party/abseil-cpp | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 15 files changed, 251 insertions(+), 53 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef4be35f3d0..035af441756 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,13 @@ set(gRPC_ABSL_USED_TARGETS absl_container_common absl_container_memory absl_cord + absl_cord_internal + absl_cordz_functions + absl_cordz_handle + absl_cordz_info + absl_cordz_statistics + absl_cordz_update_scope + absl_cordz_update_tracker absl_core_headers absl_debugging_internal absl_demangle_internal @@ -137,6 +144,7 @@ set(gRPC_ABSL_USED_TARGETS absl_kernel_timeout_internal absl_layout absl_log_severity + absl_low_level_hash absl_malloc_internal absl_memory absl_numeric_representation @@ -144,6 +152,7 @@ set(gRPC_ABSL_USED_TARGETS absl_raw_hash_map absl_raw_hash_set absl_raw_logging_internal + absl_sample_recorder absl_span absl_spinlock_wait absl_stacktrace @@ -161,7 +170,6 @@ set(gRPC_ABSL_USED_TARGETS absl_type_traits absl_utility absl_variant - absl_wyhash absl_meta ) diff --git a/Makefile b/Makefile index 04f3e53ba06..757ca7bcca9 100644 --- a/Makefile +++ b/Makefile @@ -2615,7 +2615,6 @@ endif # start of build recipe for library "grpc_abseil" (generated by makelib(lib) template function) LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/base/internal/cycleclock.cc \ - third_party/abseil-cpp/absl/base/internal/exponential_biased.cc \ third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \ third_party/abseil-cpp/absl/base/internal/raw_logging.cc \ third_party/abseil-cpp/absl/base/internal/spinlock.cc \ @@ -2636,8 +2635,9 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/debugging/symbolize.cc \ third_party/abseil-cpp/absl/hash/internal/city.cc \ third_party/abseil-cpp/absl/hash/internal/hash.cc \ - third_party/abseil-cpp/absl/hash/internal/wyhash.cc \ + third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \ third_party/abseil-cpp/absl/numeric/int128.cc \ + third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc \ third_party/abseil-cpp/absl/status/status.cc \ third_party/abseil-cpp/absl/status/status_payload_printer.cc \ third_party/abseil-cpp/absl/status/statusor.cc \ @@ -2648,7 +2648,14 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc \ third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc \ third_party/abseil-cpp/absl/strings/internal/cord_internal.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \ + third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \ + third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \ + third_party/abseil-cpp/absl/strings/internal/cordz_info.cc \ third_party/abseil-cpp/absl/strings/internal/escaping.cc \ third_party/abseil-cpp/absl/strings/internal/memutil.cc \ third_party/abseil-cpp/absl/strings/internal/ostringstream.cc \ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 76d2860f5b6..079e2403bb4 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -285,11 +285,11 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "1764491a199eb9325b177126547f03d244f86b4ff28f16f206c7b3e7e4f777ec", - strip_prefix = "abseil-cpp-278e0a071885a22dcd2fd1b5576cc44757299343", + sha256 = "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + strip_prefix = "abseil-cpp-20211102.0", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/278e0a071885a22dcd2fd1b5576cc44757299343.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/278e0a071885a22dcd2fd1b5576cc44757299343.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz", ], ) diff --git a/config.m4 b/config.m4 index ab9eedcc262..a4229ef2cff 100644 --- a/config.m4 +++ b/config.m4 @@ -688,7 +688,6 @@ if test "$PHP_GRPC" != "no"; then src/php/ext/grpc/server_credentials.c \ src/php/ext/grpc/timeval.c \ third_party/abseil-cpp/absl/base/internal/cycleclock.cc \ - third_party/abseil-cpp/absl/base/internal/exponential_biased.cc \ third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \ third_party/abseil-cpp/absl/base/internal/raw_logging.cc \ third_party/abseil-cpp/absl/base/internal/spinlock.cc \ @@ -709,8 +708,9 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/debugging/symbolize.cc \ third_party/abseil-cpp/absl/hash/internal/city.cc \ third_party/abseil-cpp/absl/hash/internal/hash.cc \ - third_party/abseil-cpp/absl/hash/internal/wyhash.cc \ + third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \ third_party/abseil-cpp/absl/numeric/int128.cc \ + third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc \ third_party/abseil-cpp/absl/status/status.cc \ third_party/abseil-cpp/absl/status/status_payload_printer.cc \ third_party/abseil-cpp/absl/status/statusor.cc \ @@ -721,7 +721,14 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc \ third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc \ third_party/abseil-cpp/absl/strings/internal/cord_internal.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \ + third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \ + third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \ + third_party/abseil-cpp/absl/strings/internal/cordz_info.cc \ third_party/abseil-cpp/absl/strings/internal/escaping.cc \ third_party/abseil-cpp/absl/strings/internal/memutil.cc \ third_party/abseil-cpp/absl/strings/internal/ostringstream.cc \ @@ -1261,6 +1268,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/debugging/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/hash/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/numeric) + PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/profiling/internal) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/status) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/strings/internal) diff --git a/config.w32 b/config.w32 index d40c72953d8..146906a68d6 100644 --- a/config.w32 +++ b/config.w32 @@ -654,7 +654,6 @@ if (PHP_GRPC != "no") { "src\\php\\ext\\grpc\\server_credentials.c " + "src\\php\\ext\\grpc\\timeval.c " + "third_party\\abseil-cpp\\absl\\base\\internal\\cycleclock.cc " + - "third_party\\abseil-cpp\\absl\\base\\internal\\exponential_biased.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\low_level_alloc.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\raw_logging.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\spinlock.cc " + @@ -675,8 +674,9 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " + "third_party\\abseil-cpp\\absl\\hash\\internal\\city.cc " + "third_party\\abseil-cpp\\absl\\hash\\internal\\hash.cc " + - "third_party\\abseil-cpp\\absl\\hash\\internal\\wyhash.cc " + + "third_party\\abseil-cpp\\absl\\hash\\internal\\low_level_hash.cc " + "third_party\\abseil-cpp\\absl\\numeric\\int128.cc " + + "third_party\\abseil-cpp\\absl\\profiling\\internal\\exponential_biased.cc " + "third_party\\abseil-cpp\\absl\\status\\status.cc " + "third_party\\abseil-cpp\\absl\\status\\status_payload_printer.cc " + "third_party\\abseil-cpp\\absl\\status\\statusor.cc " + @@ -687,7 +687,14 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\strings\\internal\\charconv_bigint.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\charconv_parse.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_internal.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_btree.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_btree_navigator.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_btree_reader.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_consume.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_ring.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_functions.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_handle.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_info.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\escaping.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\memutil.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\ostringstream.cc " + @@ -1375,6 +1382,8 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\hash"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\hash\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\numeric"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\profiling"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\profiling\\internal"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\status"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\strings\\internal"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 18c735c2547..7b986a360d4 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -194,7 +194,7 @@ Pod::Spec.new do |s| ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20210324.2' + abseil_version = '1.20211102.0' ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/core_headers', abseil_version ss.dependency 'abseil/container/flat_hash_map', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index e51d164e6d9..b24e51958c6 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -46,7 +46,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '1.20210324.2' + abseil_version = '1.20211102.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/grpc.gemspec b/grpc.gemspec index 737c38a1c33..b3ec69dbfac 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1350,8 +1350,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/base/internal/dynamic_annotations.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/endian.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/errno_saver.h ) - s.files += %w( third_party/abseil-cpp/absl/base/internal/exponential_biased.cc ) - s.files += %w( third_party/abseil-cpp/absl/base/internal/exponential_biased.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/hide_ptr.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/identity.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/inline_variable.h ) @@ -1417,8 +1415,10 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_generic-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc ) + s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_riscv-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_unimplemented-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc ) @@ -1431,6 +1431,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize.h ) s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_elf.inc ) + s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_emscripten.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc ) s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_win32.inc ) s.files += %w( third_party/abseil-cpp/absl/functional/bind_front.h ) @@ -1442,8 +1443,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/hash/internal/city.h ) s.files += %w( third_party/abseil-cpp/absl/hash/internal/hash.cc ) s.files += %w( third_party/abseil-cpp/absl/hash/internal/hash.h ) - s.files += %w( third_party/abseil-cpp/absl/hash/internal/wyhash.cc ) - s.files += %w( third_party/abseil-cpp/absl/hash/internal/wyhash.h ) + s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc ) + s.files += %w( third_party/abseil-cpp/absl/hash/internal/low_level_hash.h ) s.files += %w( third_party/abseil-cpp/absl/memory/memory.h ) s.files += %w( third_party/abseil-cpp/absl/meta/type_traits.h ) s.files += %w( third_party/abseil-cpp/absl/numeric/bits.h ) @@ -1453,6 +1454,9 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc ) s.files += %w( third_party/abseil-cpp/absl/numeric/internal/bits.h ) s.files += %w( third_party/abseil-cpp/absl/numeric/internal/representation.h ) + s.files += %w( third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc ) + s.files += %w( third_party/abseil-cpp/absl/profiling/internal/exponential_biased.h ) + s.files += %w( third_party/abseil-cpp/absl/profiling/internal/sample_recorder.h ) s.files += %w( third_party/abseil-cpp/absl/status/internal/status_internal.h ) s.files += %w( third_party/abseil-cpp/absl/status/internal/statusor_internal.h ) s.files += %w( third_party/abseil-cpp/absl/status/status.cc ) @@ -1476,10 +1480,27 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_internal.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_internal.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_functions.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_handle.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_info.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_info.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_statistics.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_update_scope.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.cc ) diff --git a/package.xml b/package.xml index 04eab622d72..1f0d3eecc62 100644 --- a/package.xml +++ b/package.xml @@ -1352,8 +1352,6 @@ - - @@ -1419,8 +1417,10 @@ + + @@ -1433,6 +1433,7 @@ + @@ -1444,8 +1445,8 @@ - - + + @@ -1455,6 +1456,9 @@ + + + @@ -1478,10 +1482,27 @@ + + + + + + + + + + + + + + + + + diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml index 6c73dd3d5ad..6e340d00387 100644 --- a/src/abseil-cpp/preprocessed_builds.yaml +++ b/src/abseil-cpp/preprocessed_builds.yaml @@ -110,15 +110,6 @@ - third_party/abseil-cpp/absl/base/internal/errno_saver.h name: absl/base:errno_saver src: [] -- cmake_target: absl::exponential_biased - deps: - - absl/base:config - - absl/base:core_headers - headers: - - third_party/abseil-cpp/absl/base/internal/exponential_biased.h - name: absl/base:exponential_biased - src: - - third_party/abseil-cpp/absl/base/internal/exponential_biased.cc - cmake_target: absl::fast_type_id deps: - absl/base:config @@ -149,15 +140,6 @@ name: absl/base:malloc_internal src: - third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc -- cmake_target: absl::periodic_sampler - deps: - - absl/base:core_headers - - absl/base:exponential_biased - headers: - - third_party/abseil-cpp/absl/base/internal/periodic_sampler.h - name: absl/base:periodic_sampler - src: - - third_party/abseil-cpp/absl/base/internal/periodic_sampler.cc - cmake_target: absl::pretty_function deps: [] headers: @@ -343,10 +325,11 @@ deps: - absl/base:base - absl/base:core_headers - - absl/base:exponential_biased - absl/container:have_sse - absl/debugging:stacktrace - absl/memory:memory + - absl/profiling:exponential_biased + - absl/profiling:sample_recorder - absl/synchronization:synchronization - absl/utility:utility headers: @@ -446,7 +429,6 @@ - absl/container:hashtable_debug_hooks - absl/container:hashtablez_sampler - absl/container:have_sse - - absl/container:layout - absl/memory:memory - absl/meta:type_traits - absl/numeric:bits @@ -533,8 +515,10 @@ - third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc - third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc - third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h + - third_party/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc - third_party/abseil-cpp/absl/debugging/internal/stacktrace_generic-inl.inc - third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc + - third_party/abseil-cpp/absl/debugging/internal/stacktrace_riscv-inl.inc - third_party/abseil-cpp/absl/debugging/internal/stacktrace_unimplemented-inl.inc - third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc - third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc @@ -558,6 +542,7 @@ - third_party/abseil-cpp/absl/debugging/symbolize.h - third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc - third_party/abseil-cpp/absl/debugging/symbolize_elf.inc + - third_party/abseil-cpp/absl/debugging/symbolize_emscripten.inc - third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc - third_party/abseil-cpp/absl/debugging/symbolize_win32.inc name: absl/debugging:symbolize @@ -610,6 +595,7 @@ headers: - third_party/abseil-cpp/absl/flags/declare.h - third_party/abseil-cpp/absl/flags/flag.h + - third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc name: absl/flags:flag src: - third_party/abseil-cpp/absl/flags/flag.cc @@ -732,6 +718,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/container:flat_hash_map - absl/flags:commandlineflag - absl/flags:config - absl/flags:flag @@ -760,6 +747,7 @@ - cmake_target: absl::function_ref deps: - absl/base:base_internal + - absl/base:core_headers - absl/meta:type_traits headers: - third_party/abseil-cpp/absl/functional/function_ref.h @@ -783,7 +771,7 @@ - absl/base:endian - absl/container:fixed_array - absl/hash:city - - absl/hash:wyhash + - absl/hash:low_level_hash - absl/meta:type_traits - absl/numeric:int128 - absl/strings:strings @@ -796,16 +784,17 @@ name: absl/hash:hash src: - third_party/abseil-cpp/absl/hash/internal/hash.cc -- cmake_target: absl::wyhash +- cmake_target: absl::low_level_hash deps: - absl/base:config - absl/base:endian + - absl/numeric:bits - absl/numeric:int128 headers: - - third_party/abseil-cpp/absl/hash/internal/wyhash.h - name: absl/hash:wyhash + - third_party/abseil-cpp/absl/hash/internal/low_level_hash.h + name: absl/hash:low_level_hash src: - - third_party/abseil-cpp/absl/hash/internal/wyhash.cc + - third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc - cmake_target: absl::memory deps: - absl/base:core_headers @@ -849,6 +838,34 @@ - third_party/abseil-cpp/absl/numeric/internal/representation.h name: absl/numeric:representation src: [] +- cmake_target: absl::exponential_biased + deps: + - absl/base:config + - absl/base:core_headers + headers: + - third_party/abseil-cpp/absl/profiling/internal/exponential_biased.h + name: absl/profiling:exponential_biased + src: + - third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc +- cmake_target: absl::periodic_sampler + deps: + - absl/base:core_headers + - absl/profiling:exponential_biased + headers: + - third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.h + name: absl/profiling:periodic_sampler + src: + - third_party/abseil-cpp/absl/profiling/internal/periodic_sampler.cc +- cmake_target: absl::sample_recorder + deps: + - absl/base:config + - absl/base:core_headers + - absl/synchronization:synchronization + - absl/time:time + headers: + - third_party/abseil-cpp/absl/profiling/internal/sample_recorder.h + name: absl/profiling:sample_recorder + src: [] - cmake_target: absl::random_internal_distribution_caller deps: - absl/base:config @@ -998,6 +1015,7 @@ deps: - absl/base:config - absl/base:core_headers + - absl/numeric:int128 - absl/random/internal:platform headers: - third_party/abseil-cpp/absl/random/internal/randen_hwaes.h @@ -1008,6 +1026,8 @@ deps: - absl/base:config - absl/base:core_headers + - absl/base:endian + - absl/numeric:int128 - absl/random/internal:platform headers: - third_party/abseil-cpp/absl/random/internal/randen_slow.h @@ -1028,6 +1048,7 @@ - cmake_target: absl::random_internal_seed_material deps: - absl/base:core_headers + - absl/base:dynamic_annotations - absl/base:raw_logging_internal - absl/random/internal:fast_uniform_bits - absl/strings:strings @@ -1151,6 +1172,7 @@ - absl/container:inlined_vector - absl/debugging:stacktrace - absl/debugging:symbolize + - absl/functional:function_ref - absl/strings:cord - absl/strings:str_format - absl/strings:strings @@ -1165,6 +1187,7 @@ - third_party/abseil-cpp/absl/status/status_payload_printer.cc - cmake_target: absl::statusor deps: + - absl/base:base - absl/base:core_headers - absl/base:raw_logging_internal - absl/meta:type_traits @@ -1181,6 +1204,7 @@ - cmake_target: absl::cord deps: - absl/base:base + - absl/base:config - absl/base:core_headers - absl/base:endian - absl/base:raw_logging_internal @@ -1189,6 +1213,11 @@ - absl/functional:function_ref - absl/meta:type_traits - absl/strings:cord_internal + - absl/strings:cordz_functions + - absl/strings:cordz_info + - absl/strings:cordz_statistics + - absl/strings:cordz_update_scope + - absl/strings:cordz_update_tracker - absl/strings:internal - absl/strings:str_format - absl/strings:strings @@ -1198,7 +1227,7 @@ name: absl/strings:cord src: - third_party/abseil-cpp/absl/strings/cord.cc -- cmake_target: absl::cord +- cmake_target: absl::cord_internal deps: - absl/base:base_internal - absl/base:config @@ -1209,17 +1238,105 @@ - absl/container:compressed_tuple - absl/container:inlined_vector - absl/container:layout + - absl/functional:function_ref - absl/meta:type_traits - absl/strings:strings + - absl/types:span headers: - third_party/abseil-cpp/absl/strings/internal/cord_internal.h + - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.h + - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.h + - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h + - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h name: absl/strings:cord_internal src: - third_party/abseil-cpp/absl/strings/internal/cord_internal.cc + - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc + - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc + - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc + - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc +- cmake_target: absl::cordz_functions + deps: + - absl/base:config + - absl/base:core_headers + - absl/base:raw_logging_internal + - absl/profiling:exponential_biased + headers: + - third_party/abseil-cpp/absl/strings/internal/cordz_functions.h + name: absl/strings:cordz_functions + src: + - third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc +- cmake_target: absl::cordz_handle + deps: + - absl/base:base + - absl/base:config + - absl/base:raw_logging_internal + - absl/synchronization:synchronization + headers: + - third_party/abseil-cpp/absl/strings/internal/cordz_handle.h + name: absl/strings:cordz_handle + src: + - third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc +- cmake_target: absl::cordz_info + deps: + - absl/base:base + - absl/base:config + - absl/base:core_headers + - absl/base:raw_logging_internal + - absl/container:inlined_vector + - absl/debugging:stacktrace + - absl/strings:cord_internal + - absl/strings:cordz_functions + - absl/strings:cordz_handle + - absl/strings:cordz_statistics + - absl/strings:cordz_update_tracker + - absl/synchronization:synchronization + - absl/types:span + headers: + - third_party/abseil-cpp/absl/strings/internal/cordz_info.h + name: absl/strings:cordz_info + src: + - third_party/abseil-cpp/absl/strings/internal/cordz_info.cc +- cmake_target: absl::cordz_sample_token + deps: + - absl/base:config + - absl/strings:cordz_handle + - absl/strings:cordz_info + headers: + - third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.h + name: absl/strings:cordz_sample_token + src: + - third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.cc +- cmake_target: absl::cordz_statistics + deps: + - absl/base:config + - absl/strings:cordz_update_tracker + headers: + - third_party/abseil-cpp/absl/strings/internal/cordz_statistics.h + name: absl/strings:cordz_statistics + src: [] +- cmake_target: absl::cordz_update_scope + deps: + - absl/base:config + - absl/base:core_headers + - absl/strings:cord_internal + - absl/strings:cordz_info + - absl/strings:cordz_update_tracker + headers: + - third_party/abseil-cpp/absl/strings/internal/cordz_update_scope.h + name: absl/strings:cordz_update_scope + src: [] +- cmake_target: absl::cordz_update_tracker + deps: + - absl/base:config + headers: + - third_party/abseil-cpp/absl/strings/internal/cordz_update_tracker.h + name: absl/strings:cordz_update_tracker + src: [] - cmake_target: absl::strings_internal deps: - absl/base:config diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index be2a26df690..f36e3bb5b59 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -653,7 +653,6 @@ CORE_SOURCE_FILES = [ 'src/core/tsi/transport_security.cc', 'src/core/tsi/transport_security_grpc.cc', 'third_party/abseil-cpp/absl/base/internal/cycleclock.cc', - 'third_party/abseil-cpp/absl/base/internal/exponential_biased.cc', 'third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc', 'third_party/abseil-cpp/absl/base/internal/raw_logging.cc', 'third_party/abseil-cpp/absl/base/internal/spinlock.cc', @@ -674,8 +673,9 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/debugging/symbolize.cc', 'third_party/abseil-cpp/absl/hash/internal/city.cc', 'third_party/abseil-cpp/absl/hash/internal/hash.cc', - 'third_party/abseil-cpp/absl/hash/internal/wyhash.cc', + 'third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc', 'third_party/abseil-cpp/absl/numeric/int128.cc', + 'third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc', 'third_party/abseil-cpp/absl/status/status.cc', 'third_party/abseil-cpp/absl/status/status_payload_printer.cc', 'third_party/abseil-cpp/absl/status/statusor.cc', @@ -686,7 +686,14 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc', 'third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_internal.cc', + 'third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc', + 'third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc', + 'third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc', + 'third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc', + 'third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc', + 'third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc', + 'third_party/abseil-cpp/absl/strings/internal/cordz_info.cc', 'third_party/abseil-cpp/absl/strings/internal/escaping.cc', 'third_party/abseil-cpp/absl/strings/internal/memutil.cc', 'third_party/abseil-cpp/absl/strings/internal/ostringstream.cc', diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index 7e2fc99ed9f..bb32d2c08ab 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -168,7 +168,7 @@ ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20210324.2' + abseil_version = '1.20211102.0' % for abseil_spec in grpcpp_abseil_specs: ss.dependency '${abseil_spec}', abseil_version % endfor diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 0ca639ca98f..4b96fa387d8 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -132,7 +132,7 @@ s.requires_arc = false name = 'grpc' - abseil_version = '1.20210324.2' + abseil_version = '1.20211102.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 278e0a07188..215105818df 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 278e0a071885a22dcd2fd1b5576cc44757299343 +Subproject commit 215105818dfde3174fe799600bb0f3cae233d0bf diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index c779fda231a..6bb161ecfea 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules" cat <"$want_submodules" -third_party/abseil-cpp 278e0a071885a22dcd2fd1b5576cc44757299343 +third_party/abseil-cpp 215105818dfde3174fe799600bb0f3cae233d0bf third_party/benchmark 0baacde3618ca617da95375e0af13ce1baadea47 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/boringssl-with-bazel 95b3ed1b01f2ef1d72fed290ed79fe1b0e7dafc0