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

Prevent null pointer exception when deleting inverter

Browse Source 
The removeInverterBySerial can be called in a webserver callback method.
This is maybe executed on another core which can then run in parallel to the radio loop hoymiles loop.
Accessing inverters which are already removed can lead to exceptions.
The Semaphore prevents that parallel execution
This commit is contained in:
Thomas Basler 2022-11-10 18:26:01 +01:00
parent 8b158a029e
commit 26b9bbf537
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Hoymiles/src/Hoymiles.cpp
View File

@ -4,10 +4,16 @@
#include "inverters/HM_4CH.h"
#include <Arduino.h>
#define HOY_SEMAPHORE_TAKE() xSemaphoreTake(_xSemaphore, portMAX_DELAY)
#define HOY_SEMAPHORE_GIVE() xSemaphoreGive(_xSemaphore)
HoymilesClass Hoymiles;
void HoymilesClass::init()
{
_xSemaphore = xSemaphoreCreateMutex();
HOY_SEMAPHORE_GIVE(); // release before first use
_pollInterval = 0;
_radio.reset(new HoymilesRadio());
_radio->init();
@ -15,6 +21,7 @@ void HoymilesClass::init()
void HoymilesClass::loop()
{
HOY_SEMAPHORE_TAKE();
_radio->loop();
if (getNumInverters() > 0) {
@ -66,6 +73,8 @@ void HoymilesClass::loop()
_lastPoll = millis();
}
}
HOY_SEMAPHORE_GIVE();
}
std::shared_ptr<InverterAbstract> HoymilesClass::addInverter(const char* name, uint64_t serial)
@ -135,7 +144,9 @@ void HoymilesClass::removeInverterBySerial(uint64_t serial)
{
for (uint8_t i = 0; i < _inverters.size(); i++) {
if (_inverters[i]->serial() == serial) {
HOY_SEMAPHORE_TAKE();
_inverters.erase(_inverters.begin() + i);
HOY_SEMAPHORE_GIVE();
return;
}
}

2
lib/Hoymiles/src/Hoymiles.h
View File

@ -31,6 +31,8 @@ private:
std::vector<std::shared_ptr<InverterAbstract>> _inverters;
std::unique_ptr<HoymilesRadio> _radio;
SemaphoreHandle_t _xSemaphore;
uint32_t _pollInterval = 0;
uint32_t _lastPoll = 0;
};