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

Improved check for garbage collection

Browse source
This commit is contained in:
KIRA Ryouta 2024-02-16 11:16:58 +09:00 • committed by Paul Ferrand
parent c566631379
commit ffaed1581a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sfizz/FilePool.cpp
View file

@ -39,6 +39,7 @@
#include <memory> #include <memory>
#include <thread> #include <thread>
#include <system_error> #include <system_error>
#include <atomic_queue/defs.h>
#if defined(_WIN32) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#else #else
@ -514,7 +515,10 @@ void sfz::FilePool::loadingJob(const QueuedFileData& data) noexcept
} }
// wait for garbage collection // wait for garbage collection
if (currentStatus == FileData::Status::GarbageCollecting) { if (currentStatus == FileData::Status::GarbageCollecting) {
std::this_thread::sleep_for(std::chrono::microseconds(1)); atomic_queue::spin_loop_pause();
atomic_queue::spin_loop_pause();
atomic_queue::spin_loop_pause();
atomic_queue::spin_loop_pause();
continue; continue;
} }
// Already loading or loaded // Already loading or loaded

3
src/sfizz/FilePool.h
View file

@ -76,7 +76,8 @@ struct FileData
} }
AudioSpan<const float> getData() AudioSpan<const float> getData()
{ {
if (availableFrames > preloadedData.getNumFrames()) ASSERT(readerCount > 0);
if (status != Status::GarbageCollecting && availableFrames > preloadedData.getNumFrames())
return AudioSpan<const float>(fileData).first(availableFrames); return AudioSpan<const float>(fileData).first(availableFrames);
else else
return AudioSpan<const float>(preloadedData); return AudioSpan<const float>(preloadedData);