patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: move battery's lock_guard to updateSettings() (#566)

Browse Source 
the updateSettings method is called from the web server's context and
therefore accesses _upProvider in a different context than the
TaskScheduler. the lock_guard needs to protect _upProvider.
This commit is contained in:
Bernhard Kirchen 2023-12-29 10:48:25 +01:00 committed by GitHub
parent 6ab706c87d
commit d769cdd30a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Battery.cpp
View File

@ -26,13 +26,14 @@ void BatteryClass::init(Scheduler& scheduler)
_loopTask.setCallback(std::bind(&BatteryClass::loop, this)); _loopTask.setCallback(std::bind(&BatteryClass::loop, this));
_loopTask.setIterations(TASK_FOREVER); _loopTask.setIterations(TASK_FOREVER);
_loopTask.enable(); _loopTask.enable();
std::lock_guard<std::mutex> lock(_mutex);
this->updateSettings(); this->updateSettings();
} }
void BatteryClass::updateSettings() void BatteryClass::updateSettings()
{ {
std::lock_guard<std::mutex> lock(_mutex);
if (_upProvider) { if (_upProvider) {
_upProvider->deinit(); _upProvider->deinit();
_upProvider = nullptr; _upProvider = nullptr;