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

Add a mutex on the loading jobs to protect them in the case of freewheeling

Browse source
This commit is contained in:
Paul Ferrand 2020-10-15 14:30:15 +01:00
parent 8369f958dd
commit a5647ab339
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/FilePool.cpp
View file

@ -482,6 +482,7 @@ void sfz::FilePool::dispatchingJob() noexcept
}
// Clear finished jobs
std::lock_guard<SpinMutex> guard { loadingJobsMutex };
swapAndPopAll(loadingJobs, [](std::future<void>& future) {
return future.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
});
@ -515,8 +516,11 @@ void sfz::FilePool::emptyFileLoadingQueues() noexcept
void sfz::FilePool::waitForBackgroundLoading() noexcept
{
std::lock_guard<SpinMutex> guard { loadingJobsMutex };
for (auto& job : loadingJobs)
job.wait();
loadingJobs.clear();
}

1
src/sfizz/FilePool.h
View file

@ -354,6 +354,7 @@ private:
void dispatchingJob() noexcept;
void garbageJob() noexcept;
void loadingJob(QueuedFileData data) noexcept;
SpinMutex loadingJobsMutex;
std::vector<std::future<void>> loadingJobs;
std::thread dispatchThread { &FilePool::dispatchingJob, this };
std::thread garbageThread { &FilePool::garbageJob, this };