reduce copies in ThreadPool

src/assets/AssetsLoader.cpp

@@ -354,7 +354,7 @@ std::shared_ptr<Task> AssetsLoader::startTask(runnable onDone) {
         std::make_shared<util::ThreadPool<aloader_entry, assetload::postfunc>>(
             "assets-loader-pool",
             [=]() { return std::make_shared<LoaderWorker>(this); },
-            [this](const assetload::postfunc& func) { func(&assets); }
+            [this](assetload::postfunc&& func) { func(&assets); }
         );
     pool->setOnComplete(std::move(onDone));
     while (!entries.empty()) {

src/graphics/render/BlocksRenderer.cpp

@@ -785,7 +785,7 @@ ChunkMesh BlocksRenderer::render(
             IndexBufferData {indexBuffer.get(), indexCount},
             IndexBufferData {denseIndexBuffer.get(), denseIndexCount},
         }
-    ), std::move(sortingMesh)};
+    ), std::move(sortingMesh), nullptr};
 }
 
 size_t BlocksRenderer::getMemoryConsumption() const {

src/graphics/render/BlocksRenderer.hpp

@@ -21,7 +21,7 @@ class VoxelsVolume;
 class ContentGfxCache;
 struct UVRegion;
 
-class BlocksRenderer {
+class BlocksRenderer final {
 public:
     BlocksRenderer(
         size_t capacity,
@@ -29,7 +29,7 @@ public:
         const ContentGfxCache& cache,
         const EngineSettings& settings
     );
-    virtual ~BlocksRenderer();
+    ~BlocksRenderer();
 
     void build(const Chunk* chunk, const VoxelsVolume& volume);
     ChunkMesh render(

src/graphics/render/ChunksRenderer.cpp

@@ -73,14 +73,16 @@ ChunksRenderer::ChunksRenderer(
                   *level, cache, settings
               );
           },
-          [&](RendererResult& result) {
-              if (!result.cancelled) {
-                  auto meshData = std::move(result.meshData);
-                  meshes[result.key] = ChunkMesh {
-                      std::make_unique<Mesh<ChunkVertex>>(meshData.mesh),
-                      std::move(meshData.sortingMesh)};
-              }
-              inwork.erase(result.key);
+          [&](RendererResult&& result) {
+                if (!result.cancelled) {
+                    auto meshData = std::move(result.meshData);
+                    auto chunk = std::make_unique<Mesh<ChunkVertex>>(meshData.mesh);
+                    meshes[result.key] = ChunkMesh {
+                        std::move(chunk),
+                        std::move(meshData.sortingMesh),
+                        nullptr};
+                }
+                inwork.erase(result.key);
           },
           settings.graphics.chunkMaxRenderers.get()
       ) {
@@ -130,8 +132,8 @@ const Mesh<ChunkVertex>* ChunksRenderer::render(
         auto voxelsBuffer = prepareVoxelsVolume(*chunk);
 
         auto mesh = renderer->render(chunk.get(), *voxelsBuffer);
-        meshes[key] =
-            ChunkMesh {std::move(mesh.mesh), std::move(mesh.sortingMeshData)};
+        meshes[key] = ChunkMesh {
+            std::move(mesh.mesh), std::move(mesh.sortingMeshData), nullptr};
         return meshes[key].mesh.get();
     }
     if (inwork.find(key) != inwork.end()) {
@@ -174,7 +176,7 @@ const Mesh<ChunkVertex>* ChunksRenderer::getOrRender(
 }
 
 void ChunksRenderer::update() {
-    threadPool.update();
+    threadPool.pullResults();
 }
 
 const Mesh<ChunkVertex>* ChunksRenderer::retrieveChunk(

src/graphics/render/commons.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
+#include "graphics/core/MeshData.hpp"
+#include "util/Buffer.hpp"
+
 #include <vector>
 #include <array>
 #include <memory>
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 
-#include "graphics/core/MeshData.hpp"
-#include "util/Buffer.hpp"
-
 /// @brief Chunk mesh vertex format
 struct ChunkVertex {
     glm::vec3 position;
@@ -49,5 +49,5 @@ struct ChunkMeshData {
 struct ChunkMesh {
     std::unique_ptr<Mesh<ChunkVertex>> mesh;
     SortingMeshData sortingMeshData;
-    std::unique_ptr<Mesh<ChunkVertex> > sortedMesh = nullptr;
+    std::unique_ptr<Mesh<ChunkVertex> > sortedMesh;
 };

src/util/ThreadPool.hpp

@@ -42,7 +42,7 @@ namespace util {
         std::condition_variable jobsMutexCondition;
         std::mutex jobsMutex;
         std::vector<std::unique_lock<std::mutex>> workersBlocked;
-        consumer<R&> resultConsumer;
+        consumer<R&&> resultConsumer;
         consumer<T&> onJobFailed = nullptr;
         runnable onComplete = nullptr;
         std::atomic<int> busyWorkers = 0;
@@ -116,7 +116,7 @@ namespace util {
         ThreadPool(
             std::string name,
             supplier<std::shared_ptr<Worker<T, R>>> workersSupplier,
-            consumer<R&> resultConsumer,
+            consumer<R&&> resultConsumer,
             int maxWorkers=UNLIMITED
         )
             : logger(std::move(name)), resultConsumer(resultConsumer) {
@@ -178,22 +178,28 @@ namespace util {
         }
 
         void update() override {
+            pullResults();
+        }
+
+        size_t pullResults(size_t maxResults = -1) {
             if (!working) {
-                return;
+                return 0;
             }
             if (failed) {
                 throw std::runtime_error("some job failed");
             }
 
             bool complete = false;
+            size_t resultsProcessed = 0;
             {
                 std::lock_guard<std::mutex> lock(resultsMutex);
-                while (!results.empty()) {
-                    ThreadPoolResult<T, R> entry = results.front();
+                while (!results.empty() && resultsProcessed < maxResults) {
+                    ThreadPoolResult<T, R> entry = std::move(results.front());
                     results.pop();
 
+                    ++resultsProcessed;
                     try {
-                        resultConsumer(entry.entry);
+                        resultConsumer(std::move(entry.entry));
                     } catch (std::exception& err) {
                         logger.error() << err.what();
                         if (onJobFailed) {
@@ -227,6 +233,7 @@ namespace util {
             if (complete) {
                 terminate();
             }
+            return resultsProcessed;
         }
 
         void enqueueJob(T job) {

src/world/files/WorldConverter.cpp

@@ -163,7 +163,7 @@ std::shared_ptr<Task> WorldConverter::startTask(
     auto pool = std::make_shared<util::ThreadPool<ConvertTask, int>>(
         "converter-pool",
         [=]() { return std::make_shared<ConverterWorker>(converter); },
-        [=](int&) {}
+        [=](int&&) {}
     );
     auto& converterTasks = converter->tasks;
     while (!converterTasks.empty()) {