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

Use a single mutex for both the garbage and last used file data structures

Browse source 
They're more or less jointly updated anyway by the garbage collection thread
This commit is contained in:
Paul Ferrand 2020-10-23 14:46:18 +02:00
parent 49b66c2ba9
commit a372d40c48
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sfizz/FilePool.cpp
View file

@ -428,7 +428,7 @@ void sfz::FilePool::loadingJob(QueuedFileData data) noexcept
data.data->status = FileData::Status::Done; data.data->status = FileData::Status::Done;
std::lock_guard<SpinMutex> guard { lastUsedMutex }; std::lock_guard<SpinMutex> guard { garbageAndLastUsedMutex };
if (absl::c_find(lastUsedFiles, *id) == lastUsedFiles.end()) if (absl::c_find(lastUsedFiles, *id) == lastUsedFiles.end())
lastUsedFiles.push_back(*id); lastUsedFiles.push_back(*id);
} }
@ -514,10 +514,7 @@ void sfz::FilePool::dispatchingJob() noexcept
void sfz::FilePool::garbageJob() noexcept void sfz::FilePool::garbageJob() noexcept
{ {
while (semGarbageBarrier.wait(), garbageFlag) { while (semGarbageBarrier.wait(), garbageFlag) {
std::lock_guard<SpinMutex> guard { garbageMutex }; std::lock_guard<SpinMutex> guard { garbageAndLastUsedMutex };
for (auto& g: garbageToCollect)
g.reset();
garbageToCollect.clear(); garbageToCollect.clear();
} }
} }
@ -587,9 +584,8 @@ void sfz::FilePool::setRamLoading(bool loadInRam) noexcept
void sfz::FilePool::triggerGarbageCollection() noexcept void sfz::FilePool::triggerGarbageCollection() noexcept
{ {
const std::unique_lock<SpinMutex> lastUsedLock { lastUsedMutex, std::try_to_lock }; const std::unique_lock<SpinMutex> guard { garbageAndLastUsedMutex, std::try_to_lock };
const std::unique_lock<SpinMutex> garbageLock { garbageMutex, std::try_to_lock }; if (!guard.owns_lock())
if (!lastUsedLock.owns_lock() || !garbageLock.owns_lock())
return; return;
const auto now = std::chrono::high_resolution_clock::now(); const auto now = std::chrono::high_resolution_clock::now();

3
src/sfizz/FilePool.h
View file

@ -362,9 +362,8 @@ private:
std::thread dispatchThread { &FilePool::dispatchingJob, this }; std::thread dispatchThread { &FilePool::dispatchingJob, this };
std::thread garbageThread { &FilePool::garbageJob, this }; std::thread garbageThread { &FilePool::garbageJob, this };
SpinMutex lastUsedMutex; SpinMutex garbageAndLastUsedMutex;
std::vector<FileId> lastUsedFiles; std::vector<FileId> lastUsedFiles;
SpinMutex garbageMutex;
std::vector<FileAudioBuffer> garbageToCollect; std::vector<FileAudioBuffer> garbageToCollect;
std::shared_ptr<ThreadPool> threadPool; std::shared_ptr<ThreadPool> threadPool;