Skip to content

Commit

Permalink
- 45690246da1e36acde86c941b68aad2248b16ea7 Import of CCTZ from Githu…
Browse files Browse the repository at this point in the history
…b. by Abseil Team <absl-team@google.com>

  - ff3cf0774f9903fb62f7012af24c0901286a1b80 Fix -Wunreachable-code-return warning (from clang 6.0) in by Derek Mauro <dmauro@google.com>
  - b41ca35e56f6137cf6672d16613a7edfd6107e27 Include port.h to drag in platform-specific configurations. by Abseil Team <absl-team@google.com>
  - 5d50b728937d245caedaa2208a97d52f55040134 Set the default symbolizer for Mutex deadlock detector re... by Derek Mauro <dmauro@google.com>

GitOrigin-RevId: 45690246da1e36acde86c941b68aad2248b16ea7
Change-Id: I2c6a87e9090657ff3fb456f3409bfdc24b8b765a
  • Loading branch information
Abseil Team authored and John Olson committed May 7, 2018
1 parent 26b789f commit bd5a2bb
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 4 deletions.
3 changes: 2 additions & 1 deletion absl/debugging/failure_signal_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,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
Expand Down
1 change: 1 addition & 0 deletions absl/debugging/internal/symbolize.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions absl/synchronization/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ cc_library(
"//absl/base:dynamic_annotations",
"//absl/base:malloc_internal",
"//absl/debugging:stacktrace",
"//absl/debugging:symbolize",
"//absl/time",
],
)
Expand Down
3 changes: 2 additions & 1 deletion absl/synchronization/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion absl/synchronization/mutex.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions absl/synchronization/mutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion absl/time/internal/cctz/testdata/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2018d-2-g8d1dac0
2018e-2-g99dd695
Binary file modified absl/time/internal/cctz/testdata/zoneinfo/Africa/Windhoek
Binary file not shown.
Binary file modified absl/time/internal/cctz/testdata/zoneinfo/Asia/Pyongyang
Binary file not shown.
Binary file modified absl/time/internal/cctz/testdata/zoneinfo/Europe/Bratislava
Binary file not shown.
Binary file modified absl/time/internal/cctz/testdata/zoneinfo/Europe/Prague
Binary file not shown.

0 comments on commit bd5a2bb

Please sign in to comment.