maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lldb] Fix "code requires global destructor" warning in g_architecture_mutex 

Differential Revision: https://reviews.llvm.org/D44060

llvm-svn: 346673
This commit is contained in:
Kuba Mracek 2018-11-12 16:52:58 +00:00
parent 63e4ebccfc
commit b2413ea9d3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/source/Core/PluginManager.cpp
View File

@ -286,7 +286,10 @@ struct ArchitectureInstance {
typedef std::vector<ArchitectureInstance> ArchitectureInstances;
static std::mutex g_architecture_mutex;
static std::mutex &GetArchitectureMutex() {
static std::mutex g_architecture_mutex;
return g_architecture_mutex;
}
static ArchitectureInstances &GetArchitectureInstances() {
static ArchitectureInstances g_instances;
@ -296,13 +299,13 @@ static ArchitectureInstances &GetArchitectureInstances() {
void PluginManager::RegisterPlugin(const ConstString &name,
llvm::StringRef description,
ArchitectureCreateInstance create_callback) {
std::lock_guard<std::mutex> guard(g_architecture_mutex);
std::lock_guard<std::mutex> guard(GetArchitectureMutex());
GetArchitectureInstances().push_back({name, description, create_callback});
}
void PluginManager::UnregisterPlugin(
ArchitectureCreateInstance create_callback) {
std::lock_guard<std::mutex> guard(g_architecture_mutex);
std::lock_guard<std::mutex> guard(GetArchitectureMutex());
auto &instances = GetArchitectureInstances();
for (auto pos = instances.begin(), end = instances.end(); pos != end; ++pos) {
@ -316,7 +319,7 @@ void PluginManager::UnregisterPlugin(
std::unique_ptr<Architecture>
PluginManager::CreateArchitectureInstance(const ArchSpec &arch) {
std::lock_guard<std::mutex> guard(g_architecture_mutex);
std::lock_guard<std::mutex> guard(GetArchitectureMutex());
for (const auto &instances : GetArchitectureInstances()) {
if (auto plugin_up = instances.create_callback(arch))
return plugin_up;