leds(rgb): also adjusted if new ledmap + grow not shrink (unless...)

FX.h: add ledsrgbSize and allocLeds() FX_fcn.cpp: - copy constructor: allocLeds() - move constructor: no change - copy assignment: reuse! + allocLeds() - move asignment: no change - resetIfRequired: no free - setUpLeds/resetSegments: allocLeds() unless...: copy constructor aften called. That is the bad boy causing re-allocs at every effect change!
2023-05-24 14:59:39 +02:00
parent b195596ad7
commit 305a5b19c4
4 changed files with 44 additions and 22 deletions
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -384,6 +384,7 @@ typedef struct Segment {
    uint16_t aux1;  // custom var
    byte* data;     // effect data pointer
    CRGB* ledsrgb;     // local leds[] array (may be a pointer to global) //WLEDMM rename to ledsrgb to search on them (temp?)
+    uint16_t ledsrgbSize; //WLEDMM
    static CRGB *_globalLeds;             // global leds[] array
    static uint16_t maxWidth, maxHeight;  // these define matrix width & height (max. segment dimensions)
    void *jMap = nullptr; //WLEDMM jMap
@@ -469,6 +470,7 @@ typedef struct Segment {
      aux1(0),
      data(nullptr),
      ledsrgb(nullptr),
+      ledsrgbSize(0), //WLEDMM
      _capabilities(0),
      _dataLen(0),
      _t(nullptr)
@@ -486,11 +488,11 @@ typedef struct Segment {

    ~Segment() {
      //#ifdef WLED_DEBUG
-      //Serial.print(F("Destroying segment:"));
-      //if (name) Serial.printf(" %s (%p)", name, name);
-      //if (data) Serial.printf(" %d (%p)", (int)_dataLen, data);
-      //if (leds) Serial.printf(" [%u]", length()*sizeof(CRGB));
-      //Serial.println();
+      Serial.print(F("Destroying segment:"));
+      if (name) Serial.printf(" %s (%p)", name, name);
+      if (data) Serial.printf(" %d (%p)", (int)_dataLen, data);
+      if (ledsrgb) Serial.printf(" [%u]", length()*sizeof(CRGB));
+      Serial.println();
      //#endif
      if (!Segment::_globalLeds && ledsrgb) free(ledsrgb);
      if (name) delete[] name;
@@ -521,6 +523,8 @@ typedef struct Segment {
    static uint16_t getUsedSegmentData(void)    { return _usedSegmentData; }
    static void     addUsedSegmentData(int len) { _usedSegmentData += len; }

+    void    allocLeds(); //WLEDMM
+
    void    set(uint16_t i1, uint16_t i2, uint8_t grp=1, uint8_t spc=0, uint16_t ofs=UINT16_MAX, uint16_t i1Y=0, uint16_t i2Y=1);
    bool    setColor(uint8_t slot, uint32_t c); //returns true if changed
    void    setCCT(uint16_t k);
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -83,40 +83,55 @@ uint16_t Segment::maxHeight = 1;

 // copy constructor
 Segment::Segment(const Segment &orig) {
-  //DEBUG_PRINTLN(F("-- Copy segment constructor --"));
-  memcpy((void*)this, (void*)&orig, sizeof(Segment));
+  USER_PRINTLN(F("-- Copy segment constructor --"));
+  memcpy((void*)this, (void*)&orig, sizeof(Segment)); //WLEDMM copy to this
  name = nullptr;
  data = nullptr;
  _dataLen = 0;
  _t = nullptr;
-  if (ledsrgb && !Segment::_globalLeds) ledsrgb = nullptr; //WLEDMM ledsrgb not freed as still used by orig!
+  if (ledsrgb && !Segment::_globalLeds) ledsrgb = nullptr; //WLEDMM constructor so there was nothing. ledsrgb not freed as still used by orig!
  if (orig.name) { name = new char[strlen(orig.name)+1]; if (name) strcpy(name, orig.name); }
  if (orig.data) { if (allocateData(orig._dataLen)) memcpy(data, orig.data, orig._dataLen); }
  if (orig._t)   { _t = new Transition(orig._t->_dur, orig._t->_briT, orig._t->_cctT, orig._t->_colorT); }
-  if (orig.ledsrgb && !Segment::_globalLeds) { ledsrgb = (CRGB*)malloc(sizeof(CRGB)*length()); if (ledsrgb) memcpy(ledsrgb, orig.ledsrgb, sizeof(CRGB)*length()); }
+  if (orig.ledsrgb && !Segment::_globalLeds) { allocLeds(); if (ledsrgb) memcpy(ledsrgb, orig.ledsrgb, sizeof(CRGB)*length()); }
  jMap = nullptr; //WLEDMM jMap
 }

+//WLEDMM: recreate ledsrgb if more space needed (will not free ledsrgb!)
+void Segment::allocLeds() {
+  if (!ledsrgb || sizeof(CRGB)*length() > ledsrgbSize) {
+    USER_PRINTF("allocLeds %d from %d\n", sizeof(CRGB)*length(), ledsrgb?ledsrgbSize:0);
+    ledsrgb = (CRGB*)malloc(sizeof(CRGB)*length());
+    ledsrgbSize = ledsrgb?sizeof(CRGB)*length():0;
+  }
+  else {
+    USER_PRINTF("reuse Leds %d from %d\n", sizeof(CRGB)*length(), ledsrgb?ledsrgbSize:0);
+  }
+}
+
 // move constructor
 Segment::Segment(Segment &&orig) noexcept {
-  //DEBUG_PRINTLN(F("-- Move segment constructor --"));
+  USER_PRINTLN(F("-- Move segment constructor --"));
  memcpy((void*)this, (void*)&orig, sizeof(Segment));
  orig.name = nullptr;
  orig.data = nullptr;
  orig._dataLen = 0;
  orig._t   = nullptr;
-  orig.ledsrgb = nullptr; //WLEDMM: do not free as moved to here
+  orig.ledsrgb = nullptr; //WLEDMM: do not free as moved to here (constructor so there where no leds)
  orig.jMap = nullptr; //WLEDMM jMap
 }

 // copy assignment
 Segment& Segment::operator= (const Segment &orig) {
-  //DEBUG_PRINTLN(F("-- Copying segment --"));
+  USER_PRINTLN(F("-- Copying segment --"));
  if (this != &orig) {
    // clean destination
    if (name) delete[] name;
    if (_t)   delete _t;
-    if (ledsrgb && !Segment::_globalLeds) free(ledsrgb); //WLEDMM: nullify below!
+    // WLEDMM reuse leds instead of removing themn
+    // if (ledsrgb && !Segment::_globalLeds) free(ledsrgb); //WLEDMM: nullify below!
+    CRGB* oldLeds = ledsrgb;
+    uint16_t oldLedsSize = ledsrgbSize;
    deallocateData();
    // copy source
    memcpy((void*)this, (void*)&orig, sizeof(Segment));
@@ -125,12 +140,12 @@ Segment& Segment::operator= (const Segment &orig) {
    data = nullptr;
    _dataLen = 0;
    _t = nullptr;
-    if (!Segment::_globalLeds) ledsrgb = nullptr;
+    if (!Segment::_globalLeds) {ledsrgb = oldLeds; ledsrgbSize = oldLedsSize;};// WLEDMM reuse leds instead of ledsrgb = nullptr;
    // copy source data
    if (orig.name) { name = new char[strlen(orig.name)+1]; if (name) strcpy(name, orig.name); }
    if (orig.data) { if (allocateData(orig._dataLen)) memcpy(data, orig.data, orig._dataLen); }
    if (orig._t)   { _t = new Transition(orig._t->_dur, orig._t->_briT, orig._t->_cctT, orig._t->_colorT); }
-    if (orig.ledsrgb && !Segment::_globalLeds) { ledsrgb = (CRGB*)malloc(sizeof(CRGB)*length()); if (ledsrgb) memcpy(ledsrgb, orig.ledsrgb, sizeof(CRGB)*length()); }
+    if (orig.ledsrgb && !Segment::_globalLeds) { allocLeds(); if (ledsrgb) memcpy(ledsrgb, orig.ledsrgb, sizeof(CRGB)*length()); }
    jMap = nullptr; //WLEDMM jMap
  }
  return *this;
@@ -138,12 +153,12 @@ Segment& Segment::operator= (const Segment &orig) {

 // move assignment
 Segment& Segment::operator= (Segment &&orig) noexcept {
-  //DEBUG_PRINTLN(F("-- Moving segment --"));
+  USER_PRINTLN(F("-- Moving segment --"));
  if (this != &orig) {
    if (name) delete[] name; // free old name
    deallocateData(); // free old runtime data
    if (_t) delete _t;
-    if (ledsrgb && !Segment::_globalLeds) free(ledsrgb); //WLEDMM: no need to nullify ledsrgb as it gets new value in memcpy
+    if (ledsrgb && !Segment::_globalLeds) free(ledsrgb); //WLEDMM: not needed anymore as we will use leds from copy. no need to nullify ledsrgb as it gets new value in memcpy
    memcpy((void*)this, (void*)&orig, sizeof(Segment));
    orig.name = nullptr;
    orig.data = nullptr;
@@ -190,7 +205,8 @@ void Segment::deallocateData() {
  */
 void Segment::resetIfRequired() {
  if (reset) {
-    if (ledsrgb && !Segment::_globalLeds) { free(ledsrgb); ledsrgb = nullptr; }
+    //WLEDMM no need to free leds as we will reuse them
+    // if (ledsrgb && !Segment::_globalLeds) { free(ledsrgb); ledsrgb = nullptr; }
    if (transitional && _t) { transitional = false; delete _t; _t = nullptr; }
    deallocateData();
    next_time = 0; step = 0; call = 0; aux0 = 0; aux1 = 0;
@@ -212,7 +228,7 @@ void Segment::setUpLeds() {
    //  ledsrgb = (CRGB*)ps_malloc(sizeof(CRGB)*length()); // softhack007 disabled; putting leds into psram leads to horrible slowdown on WROVER boards
    //else
    //#endif
-      ledsrgb = (CRGB*)malloc(sizeof(CRGB)*length());
+    allocLeds(); //WLEDMM
  }
 }

@@ -1851,6 +1867,7 @@ void WS2812FX::restartRuntime() {
 }

 void WS2812FX::resetSegments(bool boundsOnly) { //WLEDMM add boundsonly
+  USER_PRINTF("resetSegments %d %dx%d\n", boundsOnly, Segment::maxWidth, Segment::maxHeight);
  if (!boundsOnly) {
    _segments.clear(); // destructs all Segment as part of clearing
    #ifndef WLED_DISABLE_2D
@@ -1862,6 +1879,7 @@ void WS2812FX::resetSegments(bool boundsOnly) { //WLEDMM add boundsonly
    _mainSegment = 0;
  } else { //WLEDMM boundsonly
    for (segment &seg : _segments) {
+      bool recreateLeds = false;
      #ifndef WLED_DISABLE_2D
      seg.start = 0;
      seg.stop = Segment::maxWidth;
@@ -1871,9 +1889,9 @@ void WS2812FX::resetSegments(bool boundsOnly) { //WLEDMM add boundsonly
      seg.start = 0;
      seg.stop = _length;
      #endif
+      seg.allocLeds();
    }
  }
-
 }

 void WS2812FX::makeAutoSegments(bool forceReset) {
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
 */

 // version code in format yymmddb (b = daily build)
-#define VERSION 2305240
+#define VERSION 2305241

 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -415,7 +415,7 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
      char rf[4] = "RF"; rf[2] = 48+s; rf[3] = 0; //off refresh
      char aw[4] = "AW"; aw[2] = 48+s; aw[3] = 0; //auto white mode
      char wo[4] = "WO"; wo[2] = 48+s; wo[3] = 0; //swap channels
-      char sp[4] = "SP"; sp[2] = 48+s; sp[3] = 0; //bus clock speed
+      // char sp[4] = "SP"; sp[2] = 48+s; sp[3] = 0; //bus clock speed WLEDMM to do bus
      oappend(SET_F("addLEDs(1);"));
      uint8_t pins[5];
      uint8_t nPins = bus->getPins(pins);