mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-23 10:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deadlock free locking

Browse Source
This commit is contained in:
Lander Gallastegi 2025-06-25 22:08:43 +02:00
parent 7d80a457b1
commit ff99ad694a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/adaptive_mutex.h
View File

@ -18,6 +18,9 @@ public:
void unlock() {
pthread_mutex_unlock(&mutex);
}
[[nodiscard]] bool try_lock() {
return pthread_mutex_trylock(&mutex) == 0;
}
private:
pthread_mutex_t mutex = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;

15
src/video_core/page_manager.cpp
View File

@ -2,6 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <boost/container/small_vector.hpp>
#include <boost/thread/lock_algorithms.hpp>
#include "common/assert.h"
#include "common/debug.h"
#include "common/signal_context.h"
@ -194,11 +195,14 @@ struct PageManager::Impl {
size_t page = addr >> PAGE_BITS;
const u64 page_end = Common::DivCeil(addr + size, PAGE_SIZE);
const size_t lock_start = page / PAGES_PER_LOCK;
// Acquire locks for the range of pages
size_t lock_start = page / PAGES_PER_LOCK;
const size_t lock_end = Common::DivCeil(page_end, PAGES_PER_LOCK);
for (size_t i = lock_start; i < lock_end; ++i) {
locks[i].lock();
boost::container::small_vector<std::unique_lock<LockType>, 8> unique_locks;
for (; lock_start < lock_end; ++lock_start) {
unique_locks.emplace_back(locks[lock_start], std::defer_lock);
}
boost::lock(unique_locks.begin(), unique_locks.end());
auto perms = cached_pages[page].Perm();
u64 range_begin = 0;
@ -251,11 +255,6 @@ struct PageManager::Impl {
// Add pending (un)protect action
release_pending();
// Unlock all locks
for (size_t i = lock_start; i < lock_end; ++i) {
locks[i].unlock();
}
}
template <bool track>