mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use base_internal::AtomicHook instead of std::atomic (#661)

Browse source 
* Use base_internal::AtomicHook instead of std::atomic

std::atomic has a broken implementation on the Windows platform and it
is not conform to the ABSL_CONST_INIT macro when clang-cl is used as a
compiler: the macro is expanded to the [[clang::require_constant_initialization]]
attribute and the attribute cannot be applied to the broken std::atomic.

Therefore, std::atomic has been replaced with absl::base_internal::AtomicHook
to fix the compilation error (thank Derek Mauro for the suggestion).

Issue: #659

Signed-off-by: Pavel Samolysov <samolisov@gmail.com>

* Update build files for pull request

Co-authored-by: Derek Mauro <dmauro@google.com>
This commit is contained in:
Pavel Samolysov 2020-04-15 00:25:55 +03:00 committed by GitHub
parent 567bee2f73
commit 2946ac0dea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
absl/status/BUILD.bazel
View file

@ -40,6 +40,7 @@ cc_library(
],
copts = ABSL_DEFAULT_COPTS,
deps = [
"//absl/base:atomic_hook",
"//absl/base:config",
"//absl/base:core_headers",
"//absl/base:raw_logging_internal",

1
absl/status/CMakeLists.txt
View file

@ -25,6 +25,7 @@ absl_cc_library(
COPTS
${ABSL_DEFAULT_COPTS}
DEPS
absl::atomic_hook
absl::config
absl::core_headers
absl::raw_logging_internal

15
absl/status/status_payload_printer.cc
View file

@ -16,26 +16,21 @@
#include <atomic>
#include "absl/base/attributes.h"
#include "absl/base/internal/atomic_hook.h"
namespace absl {
ABSL_NAMESPACE_BEGIN
namespace status_internal {
namespace {
// Tried constant initialized global variable but it doesn't work with Lexan
// (MSVC's `std::atomic` has trouble constant initializing).
std::atomic<StatusPayloadPrinter>& GetStatusPayloadPrinterStorage() {
ABSL_CONST_INIT static std::atomic<StatusPayloadPrinter> instance{nullptr};
return instance;
}
} // namespace
ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES
static absl::base_internal::AtomicHook<StatusPayloadPrinter> storage;
void SetStatusPayloadPrinter(StatusPayloadPrinter printer) {
GetStatusPayloadPrinterStorage().store(printer, std::memory_order_relaxed);
storage.Store(printer);
}
StatusPayloadPrinter GetStatusPayloadPrinter() {
return GetStatusPayloadPrinterStorage().load(std::memory_order_relaxed);
return storage.Load();
}
} // namespace status_internal