jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Review needed] Fix Rescan Crash on MacOS

Browse source
This commit is contained in:
Dmitry K 2025-01-07 19:44:21 +00:00 • committed by Adam Honse
parent 20ae2d3662
commit d1f90e134f
2 changed files with 107 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ResourceManager.h
View file

@ -227,14 +227,22 @@ public:
void WaitForDeviceDetection();
private:
void DetectDevicesThreadFunction();
void UpdateDetectorSettings();
void SetupConfigurationDirectory();
bool AttemptLocalConnection();
void InitThreadFunction();
bool ProcessPreDetection();
void ProcessPostDetection();
bool IsAnyDimmDetectorEnabled(json &detector_settings);
void RunInBackgroundThread(std::function<void()>);
void BackgroundThreadFunction();
/*-------------------------------------------------------------------------------------*\
| Functions that must be run in the background thread |
| These are not related to STL coroutines, yet this name is the most convenient |
\*-------------------------------------------------------------------------------------*/
void InitCoroutine();
void DetectDevicesCoroutine();
void HidExitCoroutine();
/*-------------------------------------------------------------------------------------*\
| Static pointer to shared instance of ResourceManager |
@ -318,10 +326,13 @@ private:
/*-------------------------------------------------------------------------------------*\
| Detection Thread and Detection State |
\*-------------------------------------------------------------------------------------*/
std::thread * DetectDevicesThread; // Used for rescan
std::thread * InitThread; // Used for initial scan, initial network scan, server startup
std::thread * DetectDevicesThread;
std::mutex DetectDeviceMutex;
std::function<void()> ScheduledBackgroundFunction;
std::mutex BackgroundThreadStateMutex;
std::condition_variable BackgroundFunctionStartTrigger; // NOTE: wakes up the background detection thread
std::atomic<bool> background_thread_running;
std::atomic<bool> detection_is_required;
std::atomic<unsigned int> detection_percent;
std::atomic<unsigned int> detection_prev_size;