Improved check for garbage collection

sfztools · Feb 16, 2024 · d7f1d81 · d7f1d81
1 parent b0b3467
commit d7f1d81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/sfizz/FilePool.cpp b/src/sfizz/FilePool.cpp
@@ -39,6 +39,7 @@
 #include <memory>
 #include <thread>
 #include <system_error>
+#include <atomic_queue/defs.h>
 #if defined(_WIN32)
 #include <windows.h>
 #else
@@ -514,7 +515,10 @@ void sfz::FilePool::loadingJob(const QueuedFileData& data) noexcept
         }
         // wait for garbage collection
         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;
         }
         // Already loading or loaded

diff --git a/src/sfizz/FilePool.h b/src/sfizz/FilePool.h
@@ -76,7 +76,8 @@ struct FileData
     }
     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);
         else
             return AudioSpan<const float>(preloadedData);