sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the spinlock mutex in FilePool

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-08-06 16:44:39 +02:00
parent 4c1de84c0f
commit 5928218b62
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/FilePool.cpp
View file

@ -361,7 +361,7 @@ void sfz::FilePool::setPreloadSize(uint32_t preloadSize) noexcept
void sfz::FilePool::tryToClearPromises() void sfz::FilePool::tryToClearPromises()
{ {
const std::lock_guard<std::mutex> promiseLock { promiseGuard }; const std::lock_guard<SpinMutex> promiseLock { promiseGuard };
for (auto& promise: promisesToClear) { for (auto& promise: promisesToClear) {
if (promise->dataStatus != FilePromise::DataStatus::Wait) if (promise->dataStatus != FilePromise::DataStatus::Wait)
@ -442,7 +442,7 @@ void sfz::FilePool::clear()
void sfz::FilePool::cleanupPromises() noexcept void sfz::FilePool::cleanupPromises() noexcept
{ {
const std::unique_lock<std::mutex> lock { promiseGuard, std::try_to_lock }; const std::unique_lock<SpinMutex> lock { promiseGuard, std::try_to_lock };
if (!lock.owns_lock()) if (!lock.owns_lock())
return; return;

3
src/sfizz/FilePool.h
View file

@ -32,6 +32,7 @@
#include "AudioSpan.h" #include "AudioSpan.h"
#include "FileId.h" #include "FileId.h"
#include "SIMDHelpers.h" #include "SIMDHelpers.h"
#include "utility/SpinMutex.h"
#include "ghc/fs_std.hpp" #include "ghc/fs_std.hpp"
#include <absl/container/flat_hash_map.h> #include <absl/container/flat_hash_map.h>
#include <absl/types/optional.h> #include <absl/types/optional.h>
@ -288,7 +289,7 @@ private:
std::vector<FilePromisePtr> emptyPromises; std::vector<FilePromisePtr> emptyPromises;
std::vector<FilePromisePtr> temporaryFilePromises; std::vector<FilePromisePtr> temporaryFilePromises;
std::vector<FilePromisePtr> promisesToClear; std::vector<FilePromisePtr> promisesToClear;
std::mutex promiseGuard; SpinMutex promiseGuard;
// Preloaded data // Preloaded data
absl::flat_hash_map<FileId, FileDataHandle> preloadedFiles; absl::flat_hash_map<FileId, FileDataHandle> preloadedFiles;