dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-16 12:09:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Async changed to packaged_task
Some checks failed
Build and Release / reuse (push) Has been cancelled
Details
Build and Release / clang-format (push) Has been cancelled
Details
Build and Release / get-info (push) Has been cancelled
Details
Build and Release / windows-sdl (push) Has been cancelled
Details
Build and Release / macos-sdl (push) Has been cancelled
Details
Build and Release / linux-sdl (push) Has been cancelled
Details
Build and Release / linux-sdl-gcc (push) Has been cancelled
Details
Build and Release / pre-release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
psucien 2025-11-24 20:54:23 +01:00
parent b24cc42c6a
commit b7d3eae8c2
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/video_core/cache_storage.cpp
View File

@ -14,6 +14,7 @@
#include <miniz.h> #include <miniz.h>
#include <condition_variable> #include <condition_variable>
#include <functional>
#include <future> #include <future>
#include <mutex> #include <mutex>
#include <queue> #include <queue>
@ -23,7 +24,7 @@ namespace {
std::mutex submit_mutex{}; std::mutex submit_mutex{};
u32 num_requests{}; u32 num_requests{};
std::condition_variable_any request_cv{}; std::condition_variable_any request_cv{};
std::queue<std::future<void>> req_queue{}; std::queue<std::packaged_task<void()>> req_queue{};
std::mutex m_request{}; std::mutex m_request{};
mz_zip_archive zip_ar{}; mz_zip_archive zip_ar{};
@ -47,7 +48,7 @@ void ProcessIO(const std::stop_token& stoken) {
} }
while (num_requests) { while (num_requests) {
std::future<void> request{}; std::packaged_task<void()> request{};
{ {
std::scoped_lock lock{m_request}; std::scoped_lock lock{m_request};
if (req_queue.empty()) { if (req_queue.empty()) {
@ -58,7 +59,8 @@ void ProcessIO(const std::stop_token& stoken) {
} }
if (request.valid()) { if (request.valid()) {
request.wait(); request();
request.get_future().wait();
} }
--num_requests; --num_requests;
@ -135,10 +137,10 @@ void DataBase::Close() {
} }
template <typename T> template <typename T>
bool WriteVector(BlobType type, std::filesystem::path&& path_, std::vector<T>&& v) { bool WriteVector(const BlobType type, std::filesystem::path&& path_, std::vector<T>&& v) {
auto request = std::async( {
Config::isPipelineCacheArchived() ? std::launch::deferred : std::launch::async, auto request = std::packaged_task<void()>{[=]() {
[=](std::filesystem::path&& path) { auto path{path_};
path.replace_extension(GetBlobFileExtension(type)); path.replace_extension(GetBlobFileExtension(type));
if (Config::isPipelineCacheArchived()) { if (Config::isPipelineCacheArchived()) {
ASSERT_MSG(!ar_is_read_only, ASSERT_MSG(!ar_is_read_only,
@ -152,10 +154,7 @@ bool WriteVector(BlobType type, std::filesystem::path&& path_, std::vector<T>&&
const auto file = IOFile{path, FileAccessMode::Create}; const auto file = IOFile{path, FileAccessMode::Create};
file.Write(v); file.Write(v);
} }
}, }};
path_);
{
std::scoped_lock lock{m_request}; std::scoped_lock lock{m_request};
req_queue.emplace(std::move(request)); req_queue.emplace(std::move(request));
} }