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

Fixed status check order in garbage collection process

Browse source
This commit is contained in:
KIRA Ryouta 2024-02-14 16:16:21 +09:00 • committed by Paul Ferrand
parent 3164a6c502
commit f8f13f464c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sfizz/FilePool.cpp
View file

@ -678,12 +678,15 @@ void sfz::FilePool::triggerGarbageCollection() noexcept
sfz::FileData& data = it->second; sfz::FileData& data = it->second;
if (data.readerCount != 0)
return false;
auto status = data.status.load(); auto status = data.status.load();
if (data.availableFrames == 0) { if (data.availableFrames == 0) {
return status == FileData::Status::Preloaded || status == FileData::Status::FullLoaded; return status == FileData::Status::Preloaded || status == FileData::Status::FullLoaded;
} }
switch (status) { switch(status) {
case FileData::Status::Invalid: case FileData::Status::Invalid:
case FileData::Status::Streaming: case FileData::Status::Streaming:
return false; return false;
@ -691,9 +694,6 @@ void sfz::FilePool::triggerGarbageCollection() noexcept
break; break;
} }
if (data.readerCount != 0)
return false;
const auto secondsIdle = std::chrono::duration_cast<std::chrono::seconds>(now - data.lastViewerLeftAt).count(); const auto secondsIdle = std::chrono::duration_cast<std::chrono::seconds>(now - data.lastViewerLeftAt).count();
if (secondsIdle < config::fileClearingPeriod) if (secondsIdle < config::fileClearingPeriod)
return false; return false;