Added logging in callbacks and loading threads

src/sfizz/FilePool.cpp

@@ -84,7 +84,8 @@ void streamFromFile(SndfileHandle& sndFile, uint32_t numFrames, sfz::Oversamplin
     oversampler.stream(*baseBuffer, output, filledFrames);
 }
 
-sfz::FilePool::FilePool()
+sfz::FilePool::FilePool(sfz::Logger& logger)
+: logger(logger)
 {
     for (int i = 0; i < config::numBackgroundThreads; ++i)
         threadPool.emplace_back( &FilePool::loadingThread, this );
@@ -244,8 +245,9 @@ void sfz::FilePool::loadingThread() noexcept
         }
 
         threadsLoading++;
-        const auto waitDuration = std::chrono::high_resolution_clock::now() - promise->creationTime;
+        const auto loadStartTime = std::chrono::high_resolution_clock::now();
-        [[maybe_unused]] const auto waitDurationMillis = std::chrono::duration<double,std::milli>(waitDuration).count();
+        const auto waitDuration = loadStartTime - promise->creationTime;
+        logger.logFileWaitTime(waitDuration);
 
         fs::path file { rootDirectory / std::string(promise->filename) };
         SndfileHandle sndFile(file.string().c_str());
@@ -256,11 +258,12 @@ void sfz::FilePool::loadingThread() noexcept
         const auto frames = static_cast<uint32_t>(sndFile.frames());
         streamFromFile<float>(sndFile, frames, oversamplingFactor, promise->fileData, &promise->availableFrames);
         promise->dataReady = true;
+        const auto loadDuration = std::chrono::high_resolution_clock::now() - loadStartTime;
+        logger.logFileLoadTime(loadDuration, frames, promise->filename);
+
         threadsLoading--;
 
-        const auto duration = std::chrono::high_resolution_clock::now() - promise->creationTime;
+
-        [[maybe_unused]] const auto durationMillis = std::chrono::duration<double,std::milli>(duration).count();
-        // DBG("Promise filled in " << durationMillis << " ms (waiting for " << waitDurationMillis << " ms)");
 
         while (!filledPromiseQueue.try_push(promise)) {
             DBG("[sfizz] Error enqueuing the promise for " << promise->filename << " in the filledPromiseQueue");

src/sfizz/FilePool.h

@@ -33,6 +33,7 @@
 #include <absl/types/optional.h>
 #include "absl/strings/string_view.h"
 #include "atomic_queue/atomic_queue.h"
+#include "Logger.h"
 #include <chrono>
 #include <thread>
 #include <sndfile.hh>
@@ -111,7 +112,7 @@ public:
      * This creates the background threads based on config::numBackgroundThreads
      * as well as the garbage collection thread.
      */
-    FilePool();
+    FilePool(Logger& logger);
 
     ~FilePool();
     /**
@@ -212,6 +213,7 @@ public:
      */
     void waitForBackgroundLoading() noexcept;
 private:
+    Logger& logger;
     fs::path rootDirectory;
     void loadingThread() noexcept;
     void clearingThread();

src/sfizz/Resources.h

@@ -6,7 +6,7 @@ namespace sfz
 {
 struct Resources
 {
-    FilePool filePool;
     Logger logger;
+    FilePool filePool { logger };
 };
 }

src/sfizz/Synth.cpp

@@ -377,6 +377,8 @@ void sfz::Synth::setSampleRate(float sampleRate) noexcept
 void sfz::Synth::renderBlock(AudioSpan<float> buffer) noexcept
 {
     ScopedFTZ ftz;
+    const auto callbackStartTime = std::chrono::high_resolution_clock::now();
+
     buffer.fill(0.0f);
 
     resources.filePool.cleanupPromises();
@@ -397,6 +399,9 @@ void sfz::Synth::renderBlock(AudioSpan<float> buffer) noexcept
     }
 
     buffer.applyGain(db2mag(volume));
+
+    const auto callbackDuration = std::chrono::high_resolution_clock::now() - callbackStartTime;
+    resources.logger.logCallbackTime(callbackDuration);
 }
 
 void sfz::Synth::noteOn(int delay, int noteNumber, uint8_t velocity) noexcept