lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better bugfix in mode blending when _t is unallocated

Browse Source
This commit is contained in:
Blaz Kristan 2023-09-08 16:01:11 +02:00
parent 69fb15d3cb
commit e40f266042
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wled00/FX.h
View File

@ -395,10 +395,14 @@ typedef struct Segment {
}; };
uint16_t _aux0T; uint16_t _aux0T;
uint16_t _aux1T; uint16_t _aux1T;
uint32_t _stepT = 0; uint32_t _stepT;
uint32_t _callT = 0; uint32_t _callT;
uint8_t *_dataT = nullptr; uint8_t *_dataT;
uint16_t _dataLenT = 0; uint16_t _dataLenT;
TemporarySegmentData()
: _dataT(nullptr) // just in case...
, _dataLenT(0)
{}
} tmpsegd_t; } tmpsegd_t;
private: private:

13
wled00/FX_fcn.cpp
View File

@ -171,7 +171,8 @@ bool Segment::allocateData(size_t len) {
if (len == 0) return(false); // nothing to do if (len == 0) return(false); // nothing to do
if (Segment::getUsedSegmentData() + len > MAX_SEGMENT_DATA) { if (Segment::getUsedSegmentData() + len > MAX_SEGMENT_DATA) {
// not enough memory // not enough memory
DEBUG_PRINTF("!!! Effect RAM depleted: %d/%d !!!\n", len, Segment::getUsedSegmentData()); DEBUG_PRINT(F("!!! Effect RAM depleted: "));
DEBUG_PRINTF("%d/%d !!!\n", len, Segment::getUsedSegmentData());
return false; return false;
} }
// do not use SPI RAM on ESP32 since it is slow // do not use SPI RAM on ESP32 since it is slow
@ -193,11 +194,10 @@ void Segment::deallocateData() {
DEBUG_PRINT(F("---- Released data ")); DEBUG_PRINT(F("---- Released data "));
DEBUG_PRINTF("(%p): ", this); DEBUG_PRINTF("(%p): ", this);
DEBUG_PRINT(F("inconsistent UsedSegmentData ")); DEBUG_PRINT(F("inconsistent UsedSegmentData "));
DEBUG_PRINTF("(%d/%d), ", _dataLen, Segment::getUsedSegmentData()); DEBUG_PRINTF("(%d/%d)", _dataLen, Segment::getUsedSegmentData());
DEBUG_PRINTLN(F("cowardly refusing to free nothing.")); DEBUG_PRINTLN(F(", cowardly refusing to free nothing."));
} }
data = nullptr; data = nullptr;
// WARNING it looks like we have a memory leak somewhere
Segment::addUsedSegmentData(_dataLen <= Segment::getUsedSegmentData() ? -_dataLen : -Segment::getUsedSegmentData()); Segment::addUsedSegmentData(_dataLen <= Segment::getUsedSegmentData() ? -_dataLen : -Segment::getUsedSegmentData());
_dataLen = 0; _dataLen = 0;
} }
@ -372,9 +372,7 @@ uint16_t Segment::progress() {
#ifndef WLED_DISABLE_MODE_BLEND #ifndef WLED_DISABLE_MODE_BLEND
void Segment::swapSegenv(tmpsegd_t &tmpSeg) { void Segment::swapSegenv(tmpsegd_t &tmpSeg) {
if (!_t) return;
//DEBUG_PRINTF("-- Saving temp seg: %p (%p)\n", this, tmpSeg); //DEBUG_PRINTF("-- Saving temp seg: %p (%p)\n", this, tmpSeg);
// if (nullptr == &tmpSeg) { DEBUG_PRINTLN(F("swapSegenv(): tmpSeg is nullptr !!")); return; } // sanity check - should not happen as references cannot be NULL in C++
tmpSeg._optionsT = options; tmpSeg._optionsT = options;
for (size_t i=0; i<NUM_COLORS; i++) tmpSeg._colorT[i] = colors[i]; for (size_t i=0; i<NUM_COLORS; i++) tmpSeg._colorT[i] = colors[i];
tmpSeg._speedT = speed; tmpSeg._speedT = speed;
@ -391,7 +389,7 @@ void Segment::swapSegenv(tmpsegd_t &tmpSeg) {
tmpSeg._callT = call; tmpSeg._callT = call;
tmpSeg._dataT = data; tmpSeg._dataT = data;
tmpSeg._dataLenT = _dataLen; tmpSeg._dataLenT = _dataLen;
if (&tmpSeg != &(_t->_segT)) { if (_t && &tmpSeg != &(_t->_segT)) {
// swap SEGENV with transitional data // swap SEGENV with transitional data
options = _t->_segT._optionsT; options = _t->_segT._optionsT;
for (size_t i=0; i<NUM_COLORS; i++) colors[i] = _t->_segT._colorT[i]; for (size_t i=0; i<NUM_COLORS; i++) colors[i] = _t->_segT._colorT[i];
@ -415,7 +413,6 @@ void Segment::swapSegenv(tmpsegd_t &tmpSeg) {
void Segment::restoreSegenv(tmpsegd_t &tmpSeg) { void Segment::restoreSegenv(tmpsegd_t &tmpSeg) {
//DEBUG_PRINTF("-- Restoring temp seg: %p (%p)\n", this, tmpSeg); //DEBUG_PRINTF("-- Restoring temp seg: %p (%p)\n", this, tmpSeg);
// if (nullptr == &tmpSeg) {DEBUG_PRINTLN(F("restoreSegenv(): tmpSeg is nullptr !!")); return;} // sanity check - should not happen as references cannot be NULL in C++
if (_t && &(_t->_segT) != &tmpSeg) { if (_t && &(_t->_segT) != &tmpSeg) {
// update possibly changed variables to keep old effect running correctly // update possibly changed variables to keep old effect running correctly
_t->_segT._aux0T = aux0; _t->_segT._aux0T = aux0;