diff options
-rw-r--r-- | absl/debugging/failure_signal_handler.cc | 6 | ||||
-rw-r--r-- | absl/debugging/internal/symbolize.h | 1 | ||||
-rw-r--r-- | absl/strings/string_view.cc | 2 | ||||
-rw-r--r-- | absl/strings/string_view.h | 2 | ||||
-rw-r--r-- | absl/synchronization/BUILD.bazel | 1 | ||||
-rw-r--r-- | absl/synchronization/CMakeLists.txt | 3 | ||||
-rw-r--r-- | absl/synchronization/mutex.cc | 4 | ||||
-rw-r--r-- | absl/synchronization/mutex.h | 6 | ||||
-rw-r--r-- | absl/time/internal/cctz/testdata/version | 2 | ||||
-rw-r--r-- | absl/time/internal/cctz/testdata/zoneinfo/Africa/Windhoek | bin | 1030 -> 988 bytes | |||
-rw-r--r-- | absl/time/internal/cctz/testdata/zoneinfo/Asia/Pyongyang | bin | 272 -> 267 bytes | |||
-rw-r--r-- | absl/time/internal/cctz/testdata/zoneinfo/Europe/Bratislava | bin | 2272 -> 2338 bytes | |||
-rw-r--r-- | absl/time/internal/cctz/testdata/zoneinfo/Europe/Prague | bin | 2272 -> 2338 bytes |
13 files changed, 20 insertions, 7 deletions
diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc index 3de45f0bb22c..46ef7b8f5a2f 100644 --- a/absl/debugging/failure_signal_handler.cc +++ b/absl/debugging/failure_signal_handler.cc @@ -135,6 +135,9 @@ static bool SetupAlternateStackOnce() { #ifndef MAP_STACK #define MAP_STACK 0 #endif +#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) +#define MAP_ANONYMOUS MAP_ANON +#endif sigstk.ss_sp = mmap(nullptr, sigstk.ss_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0); if (sigstk.ss_sp == MAP_FAILED) { @@ -162,8 +165,9 @@ static int MaybeSetupAlternateStack() { #ifndef _WIN32 ABSL_ATTRIBUTE_UNUSED static const bool kOnce = SetupAlternateStackOnce(); return SA_ONSTACK; -#endif +#else return 0; +#endif } #ifdef ABSL_HAVE_SIGACTION diff --git a/absl/debugging/internal/symbolize.h b/absl/debugging/internal/symbolize.h index 7ae13839b7c3..8d926fec48aa 100644 --- a/absl/debugging/internal/symbolize.h +++ b/absl/debugging/internal/symbolize.h @@ -20,6 +20,7 @@ #include <cstddef> #include <cstdint> +#include "absl/base/port.h" // Needed for string vs std::string #ifdef ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE #error ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE cannot be directly set diff --git a/absl/strings/string_view.cc b/absl/strings/string_view.cc index 0e1729546a5f..4ceeb6bff580 100644 --- a/absl/strings/string_view.cc +++ b/absl/strings/string_view.cc @@ -22,8 +22,6 @@ #include <ostream> #include "absl/strings/internal/memutil.h" -#include "absl/strings/internal/resize_uninitialized.h" -#include "absl/strings/match.h" namespace absl { diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h index 9162bb33d400..a7f9199240a2 100644 --- a/absl/strings/string_view.h +++ b/absl/strings/string_view.h @@ -36,7 +36,7 @@ namespace absl { using std::string_view; -}; +} // namespace absl #else // ABSL_HAVE_STD_STRING_VIEW diff --git a/absl/synchronization/BUILD.bazel b/absl/synchronization/BUILD.bazel index 69f9c81f6f6a..05376903fe01 100644 --- a/absl/synchronization/BUILD.bazel +++ b/absl/synchronization/BUILD.bazel @@ -77,6 +77,7 @@ cc_library( "//absl/base:dynamic_annotations", "//absl/base:malloc_internal", "//absl/debugging:stacktrace", + "//absl/debugging:symbolize", "//absl/time", ], ) diff --git a/absl/synchronization/CMakeLists.txt b/absl/synchronization/CMakeLists.txt index c8f84faf8b5a..6886c1ca6117 100644 --- a/absl/synchronization/CMakeLists.txt +++ b/absl/synchronization/CMakeLists.txt @@ -44,7 +44,8 @@ list(APPEND SYNCHRONIZATION_SRC "notification.cc" "mutex.cc" ) -set(SYNCHRONIZATION_PUBLIC_LIBRARIES absl::base absl::time) + +set(SYNCHRONIZATION_PUBLIC_LIBRARIES absl::base absl::stacktrace absl::symbolize absl::time) absl_library( TARGET diff --git a/absl/synchronization/mutex.cc b/absl/synchronization/mutex.cc index 33f92d8fabba..bd54a4dc2157 100644 --- a/absl/synchronization/mutex.cc +++ b/absl/synchronization/mutex.cc @@ -50,6 +50,7 @@ #include "absl/base/internal/thread_identity.h" #include "absl/base/port.h" #include "absl/debugging/stacktrace.h" +#include "absl/debugging/symbolize.h" #include "absl/synchronization/internal/graphcycles.h" #include "absl/synchronization/internal/per_thread_sem.h" #include "absl/time/time.h" @@ -111,7 +112,8 @@ ABSL_CONST_INIT absl::base_internal::AtomicHook< ABSL_CONST_INIT absl::base_internal::AtomicHook< void (*)(const char *msg, const void *cv)> cond_var_tracer; ABSL_CONST_INIT absl::base_internal::AtomicHook< - bool (*)(const void *pc, char *out, int out_size)> symbolizer; + bool (*)(const void *pc, char *out, int out_size)> + symbolizer(absl::Symbolize); } // namespace diff --git a/absl/synchronization/mutex.h b/absl/synchronization/mutex.h index c4e026f9b936..368684bf2e27 100644 --- a/absl/synchronization/mutex.h +++ b/absl/synchronization/mutex.h @@ -979,6 +979,12 @@ void RegisterCondVarTracer(void (*fn)(const char *msg, const void *cv)); // to 'out.' // // This has the same memory ordering concerns as RegisterMutexProfiler() above. +// +// DEPRECATED: The default symbolizer function is absl::Symbolize() and the +// ability to register a different hook for symbolizing stack traces will be +// removed on or after 2023-05-01. +ABSL_DEPRECATED("absl::RegisterSymbolizer() is deprecated and will be removed " + "on or after 2023-05-01") void RegisterSymbolizer(bool (*fn)(const void *pc, char *out, int out_size)); // EnableMutexInvariantDebugging() diff --git a/absl/time/internal/cctz/testdata/version b/absl/time/internal/cctz/testdata/version index 05c3ec2807de..fe86b5cc8772 100644 --- a/absl/time/internal/cctz/testdata/version +++ b/absl/time/internal/cctz/testdata/version @@ -1 +1 @@ -2018d-2-g8d1dac0 +2018e-2-g99dd695 diff --git a/absl/time/internal/cctz/testdata/zoneinfo/Africa/Windhoek b/absl/time/internal/cctz/testdata/zoneinfo/Africa/Windhoek index 358f11e329bf..f5d40bafc391 100644 --- a/absl/time/internal/cctz/testdata/zoneinfo/Africa/Windhoek +++ b/absl/time/internal/cctz/testdata/zoneinfo/Africa/Windhoek Binary files differdiff --git a/absl/time/internal/cctz/testdata/zoneinfo/Asia/Pyongyang b/absl/time/internal/cctz/testdata/zoneinfo/Asia/Pyongyang index de5c2b156653..dc24926e80f2 100644 --- a/absl/time/internal/cctz/testdata/zoneinfo/Asia/Pyongyang +++ b/absl/time/internal/cctz/testdata/zoneinfo/Asia/Pyongyang Binary files differdiff --git a/absl/time/internal/cctz/testdata/zoneinfo/Europe/Bratislava b/absl/time/internal/cctz/testdata/zoneinfo/Europe/Bratislava index 4eabe5c81bd1..ba82f311b748 100644 --- a/absl/time/internal/cctz/testdata/zoneinfo/Europe/Bratislava +++ b/absl/time/internal/cctz/testdata/zoneinfo/Europe/Bratislava Binary files differdiff --git a/absl/time/internal/cctz/testdata/zoneinfo/Europe/Prague b/absl/time/internal/cctz/testdata/zoneinfo/Europe/Prague index 4eabe5c81bd1..ba82f311b748 100644 --- a/absl/time/internal/cctz/testdata/zoneinfo/Europe/Prague +++ b/absl/time/internal/cctz/testdata/zoneinfo/Europe/Prague Binary files differ |