This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG862a311301f5: [lldb] Tighten lock in Language::ForEach
(authored by bulbazord).
Changed prior to commit:
https://reviews.llvm.org/D109013?vs=369758&id=369809#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D109013/new/
https://reviews.llvm.org/D109013
Files:
lldb/source/Target/Language.cpp
Index: lldb/source/Target/Language.cpp
===================================================================
--- lldb/source/Target/Language.cpp
+++ lldb/source/Target/Language.cpp
@@ -108,10 +108,21 @@
}
});
- std::lock_guard<std::mutex> guard(GetLanguagesMutex());
- LanguagesMap &map(GetLanguagesMap());
- for (const auto &entry : map) {
- if (!callback(entry.second.get()))
+ // callback may call a method in Language that attempts to acquire the same
+ // lock (such as Language::ForEach or Language::FindPlugin). To avoid a
+ // deadlock, we do not use callback while holding the lock.
+ std::vector<Language *> loaded_plugins;
+ {
+ std::lock_guard<std::mutex> guard(GetLanguagesMutex());
+ LanguagesMap &map(GetLanguagesMap());
+ for (const auto &entry : map) {
+ if (entry.second)
+ loaded_plugins.push_back(entry.second.get());
+ }
+ }
+
+ for (auto *lang : loaded_plugins) {
+ if (!callback(lang))
break;
}
}
Index: lldb/source/Target/Language.cpp
===================================================================
--- lldb/source/Target/Language.cpp
+++ lldb/source/Target/Language.cpp
@@ -108,10 +108,21 @@
}
});
- std::lock_guard<std::mutex> guard(GetLanguagesMutex());
- LanguagesMap &map(GetLanguagesMap());
- for (const auto &entry : map) {
- if (!callback(entry.second.get()))
+ // callback may call a method in Language that attempts to acquire the same
+ // lock (such as Language::ForEach or Language::FindPlugin). To avoid a
+ // deadlock, we do not use callback while holding the lock.
+ std::vector<Language *> loaded_plugins;
+ {
+ std::lock_guard<std::mutex> guard(GetLanguagesMutex());
+ LanguagesMap &map(GetLanguagesMap());
+ for (const auto &entry : map) {
+ if (entry.second)
+ loaded_plugins.push_back(entry.second.get());
+ }
+ }
+
+ for (auto *lang : loaded_plugins) {
+ if (!callback(lang))
break;
}
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
