support lus thread_pool changes (HarbourMasters#4127)

briaguya-ai · May 9, 2024 · b0b0447 · b0b0447
1 parent 3bcf178
commit b0b0447
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/libultraship b/libultraship
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
@@ -1249,7 +1249,7 @@ void SaveManager::SaveSection(int fileNum, int sectionID, bool threaded) {
     auto saveContext = new SaveContext;
     memcpy(saveContext, &gSaveContext, sizeof(gSaveContext));
     if (threaded) {
-        smThreadPool->push_task_back(&SaveManager::SaveFileThreaded, this, fileNum, saveContext, sectionID);
+        smThreadPool->detach_task(std::bind(&SaveManager::SaveFileThreaded, this, fileNum, saveContext, sectionID));
     } else {
         SaveFileThreaded(fileNum, saveContext, sectionID);
     }
@@ -1340,7 +1340,7 @@ void SaveManager::LoadFile(int fileNum) {
 
 void SaveManager::ThreadPoolWait() {
     if (smThreadPool) {
-        smThreadPool->wait_for_tasks();
+        smThreadPool->wait();
     }
 }
 

diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
@@ -40,7 +40,10 @@ typedef struct {
 #include <functional>
 #include <vector>
 #include <filesystem>
-#include "thread-pool/BS_thread_pool.hpp"
+
+#define BS_THREAD_POOL_ENABLE_PRIORITY
+#define BS_THREAD_POOL_ENABLE_PAUSE
+#include <BS_thread_pool.hpp>
 
 #include "z64save.h"
+0 −1		CMakeLists.txt
+10 −0		cmake/dependencies/common.cmake
+0 −6		extern/CMakeLists.txt
+0 −37		extern/thread-pool/.github/ISSUE_TEMPLATE/bug_report.md
+0 −26		extern/thread-pool/.github/ISSUE_TEMPLATE/failed-tests.md
+0 −23		extern/thread-pool/.github/ISSUE_TEMPLATE/feature_request.md
+0 −20		extern/thread-pool/.github/pull_request_template.md
+0 −827		extern/thread-pool/BS_thread_pool.hpp
+0 −325		extern/thread-pool/BS_thread_pool_light.hpp
+0 −657		extern/thread-pool/BS_thread_pool_light_test.cpp
+0 −1,063		extern/thread-pool/BS_thread_pool_test.cpp
+0 −218		extern/thread-pool/CHANGELOG.md
+0 −13		extern/thread-pool/CITATION.bib
+0 −24		extern/thread-pool/CITATION.cff
+0 −21		extern/thread-pool/LICENSE.txt
+0 −1,498		extern/thread-pool/README.md
+5 −9		src/resource/ResourceManager.cpp
+6 −3		src/resource/ResourceManager.h