AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

hecl/hecl: Simplify SetThreadRes()

This commit is contained in:
Lioncash 2019-08-24 15:36:35 -04:00
parent 32fec587b5
commit bc7a6563cf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hecl/lib/hecl.cpp
View File

@ -135,14 +135,17 @@ bool ResourceLock::InProgress(const ProjectPath& path) {
bool ResourceLock::SetThreadRes(const ProjectPath& path) { bool ResourceLock::SetThreadRes(const ProjectPath& path) {
std::unique_lock lk{PathsMutex}; std::unique_lock lk{PathsMutex};
if (PathsInProgress.find(std::this_thread::get_id()) != PathsInProgress.cend()) if (PathsInProgress.find(std::this_thread::get_id()) != PathsInProgress.cend()) {
LogModule.report(logvisor::Fatal, fmt("multiple resource locks on thread")); LogModule.report(logvisor::Fatal, fmt("multiple resource locks on thread"));
}
for (const auto& p : PathsInProgress) const bool isInProgress = std::any_of(PathsInProgress.cbegin(), PathsInProgress.cend(),
if (p.second == path) [&path](const auto& entry) { return entry.second == path; });
return false; if (isInProgress) {
return false;
}
PathsInProgress[std::this_thread::get_id()] = path; PathsInProgress.insert_or_assign(std::this_thread::get_id(), path);
return true; return true;
} }