Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Avoid dead-lock if other = this

Browse Source
This commit is contained in:
Patrick Niklaus 2017-06-23 10:36:23 +00:00 committed by Patrick Niklaus
parent 688b1f8bef
commit 22479ff5d8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/util/concurrent_id_map.hpp
View File

@ -30,17 +30,23 @@ struct ConcurrentIDMap
ConcurrentIDMap() = default; ConcurrentIDMap() = default;
ConcurrentIDMap(ConcurrentIDMap &&other) ConcurrentIDMap(ConcurrentIDMap &&other)
{ {
ScopedWriterLock other_lock{other.mutex}; if (this != &other)
ScopedWriterLock lock{mutex}; {
ScopedWriterLock other_lock{other.mutex};
ScopedWriterLock lock{mutex};
data = std::move(other.data); data = std::move(other.data);
}
} }
ConcurrentIDMap &operator=(ConcurrentIDMap &&other) ConcurrentIDMap &operator=(ConcurrentIDMap &&other)
{ {
ScopedWriterLock other_lock{other.mutex}; if (this != &other)
ScopedWriterLock lock{mutex}; {
ScopedWriterLock other_lock{other.mutex};
ScopedWriterLock lock{mutex};
data = std::move(other.data); data = std::move(other.data);
}
return *this; return *this;
} }