summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMerry <git@mary.rs>2022-04-07 20:30:55 +0200
committerMerry <git@mary.rs>2022-04-07 20:30:55 +0200
commitc589db6adde8e4706065b1ab00bd6814b39dc8bb (patch)
tree19430d5342df4de9b8fc196012e53b09fb8f5f41
parentMerge pull request #8161 from liamwhite/gl-s8d24 (diff)
downloadyuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.gz
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.bz2
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.lz
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.xz
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.tar.zst
yuzu-c589db6adde8e4706065b1ab00bd6814b39dc8bb.zip
-rw-r--r--src/common/host_memory.cpp4
-rw-r--r--src/common/thread.h2
-rw-r--r--src/common/threadsafe_queue.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index e829af1ac..802943eb7 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -149,7 +149,7 @@ public:
}
void Unmap(size_t virtual_offset, size_t length) {
- std::lock_guard lock{placeholder_mutex};
+ std::scoped_lock lock{placeholder_mutex};
// Unmap until there are no more placeholders
while (UnmapOnePlaceholder(virtual_offset, length)) {
@@ -169,7 +169,7 @@ public:
}
const size_t virtual_end = virtual_offset + length;
- std::lock_guard lock{placeholder_mutex};
+ std::scoped_lock lock{placeholder_mutex};
auto [it, end] = placeholders.equal_range({virtual_offset, virtual_end});
while (it != end) {
const size_t offset = std::max(it->lower(), virtual_offset);
diff --git a/src/common/thread.h b/src/common/thread.h
index a8c17c71a..626609372 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -17,7 +17,7 @@ namespace Common {
class Event {
public:
void Set() {
- std::lock_guard lk{mutex};
+ std::scoped_lock lk{mutex};
if (!is_set) {
is_set = true;
condvar.notify_one();
diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h
index 2c8c2b90e..7272ac6e8 100644
--- a/src/common/threadsafe_queue.h
+++ b/src/common/threadsafe_queue.h
@@ -52,7 +52,7 @@ public:
// line before cv.wait
// TODO(bunnei): This can be replaced with C++20 waitable atomics when properly supported.
// See discussion on https://github.com/yuzu-emu/yuzu/pull/3173 for details.
- std::lock_guard lock{cv_mutex};
+ std::scoped_lock lock{cv_mutex};
cv.notify_one();
}
@@ -159,7 +159,7 @@ public:
template <typename Arg>
void Push(Arg&& t) {
- std::lock_guard lock{write_lock};
+ std::scoped_lock lock{write_lock};
spsc_queue.Push(t);
}