oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

treewide: replace lock_guard with scoped_lock

Browse Source 
SonarLint reports the latter to be better:

std::scoped_lock basically provides the same feature as std::lock_guard,
but is more generic: It can lock several mutexes at the same time, with a
deadlock prevention mechanism (see {rule:cpp:S5524}). The equivalent code
to perform simultaneous locking with std::lock_guard is significantly more
complex. Therefore, it is simpler to use std::scoped_lock all the time,
even when locking only one mutex (there will be no performance impact).

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2021-11-11 16:19:32 -08:00
parent a8c77a6fba
commit 4e0e4c00bf
64 changed files with 196 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tag/Builder.cxx
View File

@@ -38,7 +38,7 @@ TagBuilder::TagBuilder(const Tag &other) noexcept
const std::size_t n = other.num_items;
if (n > 0) {
const std::lock_guard<Mutex> protect(tag_pool_lock);
const std::scoped_lock<Mutex> protect(tag_pool_lock);
for (std::size_t i = 0; i != n; ++i)
items.push_back(tag_pool_dup_item(other.items[i]));
}
@@ -72,7 +72,7 @@ TagBuilder::operator=(const TagBuilder &other) noexcept
items = other.items;
/* increment the tag pool refcounters */
const std::lock_guard<Mutex> protect(tag_pool_lock);
const std::scoped_lock<Mutex> protect(tag_pool_lock);
for (auto &i : items)
i = tag_pool_dup_item(i);
}
@@ -188,7 +188,7 @@ TagBuilder::Complement(const Tag &other) noexcept
const std::size_t n = other.num_items;
if (n > 0) {
const std::lock_guard<Mutex> protect(tag_pool_lock);
const std::scoped_lock<Mutex> protect(tag_pool_lock);
for (std::size_t i = 0; i != n; ++i) {
TagItem *item = other.items[i];
if (!present[item->type])
@@ -203,7 +203,7 @@ TagBuilder::AddItemUnchecked(TagType type, StringView value) noexcept
TagItem *i;
{
const std::lock_guard<Mutex> protect(tag_pool_lock);
const std::scoped_lock<Mutex> protect(tag_pool_lock);
i = tag_pool_get_item(type, value);
}
@@ -252,7 +252,7 @@ TagBuilder::RemoveAll() noexcept
return;
{
const std::lock_guard<Mutex> protect(tag_pool_lock);
const std::scoped_lock<Mutex> protect(tag_pool_lock);
for (auto i : items)
tag_pool_put_item(i);
}