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

Added a method in the file pool to wait on the background threads to finish loading

Browse source
This commit is contained in:
Paul Ferrand 2019-12-08 18:09:21 +01:00
parent 6a40d0e778
commit f1653a499d
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/sfizz/FilePool.cpp
View file

@ -165,6 +165,8 @@ void sfz::FilePool::loadingThread() noexcept
// The voice abandoned the promise already we just don't care
if (promise.use_count() != 1) {
threadsLoading++;
fs::path file { rootDirectory / std::string(promise->filename) };
SndfileHandle sndFile(reinterpret_cast<const char*>(file.c_str()));
if (sndFile.error() != 0)
@ -174,6 +176,8 @@ void sfz::FilePool::loadingThread() noexcept
const uint32_t frames = sndFile.frames();
promise->fileData = readFromFile<float>(sndFile, frames, oversamplingFactor);
promise->dataReady = true;
threadsLoading--;
}
while (!filledPromiseQueue.try_enqueue(promise)) {
@ -246,3 +250,15 @@ void sfz::FilePool::emptyFileLoadingQueues() noexcept
while (emptyQueue)
std::this_thread::sleep_for(1ms);
}
void sfz::FilePool::waitForBackgroundLoading() noexcept
{
// TODO: validate that this is enough, otherwise we will need an atomic count
// of the files we need to load still.
// Spinlocking on the size of the background queue
while (promiseQueue.size_approx() > 0)
std::this_thread::sleep_for(0.1ms);
// Spinlocking on the threads possibly logging in the background
while (threadsLoading > 0)
std::this_thread::sleep_for(0.1ms);
}

2
src/sfizz/FilePool.h
View file

@ -142,6 +142,7 @@ public:
void setOversamplingFactor(Oversampling factor) noexcept;
Oversampling getOversamplingFactor() const noexcept;
void emptyFileLoadingQueues() noexcept;
void waitForBackgroundLoading() noexcept;
private:
fs::path rootDirectory;
void loadingThread() noexcept;
@ -153,6 +154,7 @@ private:
// Signals
bool quitThread { false };
bool emptyQueue { false };
std::atomic<int> threadsLoading { 0 };
std::vector<FilePromisePtr> temporaryFilePromises;
std::vector<FilePromisePtr> promisesToClean;