aboutsummaryrefslogtreecommitdiffhomepage
path: root/absl/flags/internal/registry.cc
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2019-05-14 10:53:39 -0700
committerGravatar Andy Soffer <asoffer@google.com>2019-05-14 14:23:52 -0400
commit436ba6c4a0ea3a06eca6e055f9c8d296bf3bae12 (patch)
tree624a7ef0a545553ecce04123f0ccf463a9993477 /absl/flags/internal/registry.cc
parent0cbdc774b97f7e80ab60dbe2ed4eaca3b2e33fc8 (diff)
Export of internal Abseil changes.
-- 22fceefcf070a0cf89bf1846bee16a9d36ad4161 by Derek Mauro <dmauro@google.com>: Use function static for once initialization of flag registry. This is a workaround for the MSVC debug constexpr initialization issue in absl::once_flag. GitHub #304 PiperOrigin-RevId: 248169007 -- 97bbe6a5233802b61e758c55f7ba8926539cc4ca by Chris Kennelly <ckennelly@google.com>: Internal change PiperOrigin-RevId: 248139347 -- e72640ee079b9fa44e2c7f925fa0a608bcfea515 by Derek Mauro <dmauro@google.com>: Re-write flags config. It doesn't have to be written in the convoluted way it currently is in the opensource-only code path. PiperOrigin-RevId: 248010502 -- 2a72552511b8086c78cb43012c1644e519b3807e by Abseil Team <absl-team@google.com>: Handle pthread_getschedparam() failure. Log an error message if pthread_getschedparam() fails. In Android's Media Framework, libminijail (which I believe is a sandbox) aborts the process if pthread_getschedparam() is called: media.swcodec: libminijail[7526]: blocked syscall: sched_getparam ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ /system/bin/tombstoned: received crash request for pid 7526 Although this CL cannot handle that extreme failure mode, it handles an error return from pthread_getschedparam() and won't use the uninitialized param.sched_priority value in that case. PiperOrigin-RevId: 247999953 -- bb154a92be37987d00d652c7c792594f2f515d83 by Abseil Team <absl-team@google.com>: Allow intrinsic int128 to be set for __aarch64__ targets. PiperOrigin-RevId: 247977594 GitOrigin-RevId: 22fceefcf070a0cf89bf1846bee16a9d36ad4161 Change-Id: I1f7ccfd82eb71446277a8e6f542fe835ac173d71
Diffstat (limited to 'absl/flags/internal/registry.cc')
-rw-r--r--absl/flags/internal/registry.cc18
1 files changed, 2 insertions, 16 deletions
diff --git a/absl/flags/internal/registry.cc b/absl/flags/internal/registry.cc
index 435c5b0..e52cbb6 100644
--- a/absl/flags/internal/registry.cc
+++ b/absl/flags/internal/registry.cc
@@ -15,7 +15,6 @@
#include "absl/flags/internal/registry.h"
-#include "absl/base/call_once.h"
#include "absl/base/dynamic_annotations.h"
#include "absl/base/internal/raw_logging.h"
#include "absl/flags/config.h"
@@ -151,12 +150,6 @@ class FlagRegistry {
FlagPtrMap flag_ptr_map_;
- static FlagRegistry* global_registry_; // a singleton registry
-
- static absl::once_flag global_registry_once_;
-
- static void InitGlobalRegistry();
-
absl::Mutex lock_;
// Disallow
@@ -164,16 +157,9 @@ class FlagRegistry {
FlagRegistry& operator=(const FlagRegistry&);
};
-// Get the singleton FlagRegistry object
-FlagRegistry* FlagRegistry::global_registry_ = nullptr;
-absl::once_flag FlagRegistry::global_registry_once_;
-
-void FlagRegistry::InitGlobalRegistry() { global_registry_ = new FlagRegistry; }
-
FlagRegistry* FlagRegistry::GlobalRegistry() {
- absl::call_once(global_registry_once_, &InitGlobalRegistry);
-
- return global_registry_;
+ static FlagRegistry* global_registry = new FlagRegistry;
+ return global_registry;
}
namespace {