more safety guards

Author: vortigont

src/display.cpp

@@ -296,6 +296,7 @@ int LEDDisplay::getColorOrder() const {
 void LEDDisplay::show(){
   if (!_dengine) return;
   if (_use_db){
+    std::lock_guard<std::mutex> lock(_dbuff_mtx);
     // save buffer content
     _dengine->copyFront2Back();
   }
@@ -310,15 +311,18 @@ void LEDDisplay::show(){
   _dengine->show();
 
   if (_use_db){
+    std::lock_guard<std::mutex> lock(_dbuff_mtx);
     // restore buffer content
     _dengine->flipBuffer();
   }
 };
 
 void LEDDisplay::canvasProtect(bool v){
-  if (_dengine)
+  if (_dengine){
+    std::lock_guard<std::mutex> lock(_dbuff_mtx);
     _dengine->doubleBuffer(v);
-  _use_db = v;
+    _use_db = v;
+  }
 }
 
 void LEDDisplay::attachOverlay( overlay_cb_t f){

src/display.hpp

@@ -113,6 +113,8 @@ class LEDDisplay {
      */
     std::list< overlay_cb_t > _stack;
     std::mutex _stack_mtx;
+    // double buff mutex
+    std::mutex _dbuff_mtx;
 
 
     bool _start_rmt(const JsonDocument& doc);
@@ -172,7 +174,12 @@ class LEDDisplay {
     //void overlay_render();
 
     // Wipe all layers and buffers
-    void clear(){ if (_dengine) _dengine->clear(); };
+    void clear(){
+        if (_dengine){
+            std::lock_guard<std::mutex> lock(_dbuff_mtx);
+            _dengine->clear();
+        }
+    };
 
     // backend brightness control
     uint8_t brightness(uint8_t brt);

src/effectworker.cpp

@@ -322,13 +322,7 @@ void EffConfiguration::_savecfg(JsonVariant doc){
   for (const auto& i: _controls){
     a[i.getName()] = i.getVal();
   }
-/*
-  for (const auto& i: _controls){
-    JsonObject kv = a.add<JsonObject>();
-    kv[P_id] = i.getName();
-    kv[P_value] = i.getVal();
-  }
-*/
+
   String fname(effects_cfg_fldr);
   fname += EffectsListItem_t::getLbl(_eid);
   fname += T__json;
@@ -688,7 +682,7 @@ void EffectWorker::_spawn(effect_t eid, bool rnd_ctrls){
   // apply effect's controls
   rnd_ctrls ? applyRandomControls() : applyControls();
 
-  display.canvasProtect (worker->getCanvasProtect());         // set 'persistent' frambuffer flag if effect's manifest demands it
+  display.canvasProtect(worker->getCanvasProtect());         // set 'persistent' frambuffer flag if effect's manifest demands it
 
   // release mutex after effect init has complete
   lock.unlock();
@@ -994,6 +988,8 @@ void EffectWorker::_runnerHndlr(){
       continue;
 
     if (worker->run()){
+      // release mutex
+      lock.unlock();
       // effect has rendered a data in buffer, need to call the engine draw it
       display.show();
 
@@ -1007,11 +1003,11 @@ void EffectWorker::_runnerHndlr(){
         t = millis();
       }
 #endif
+    } else {
+      // effectcalc returned no data
+      // release mutex
+      lock.unlock();
     }
-    // effectcalc returned no data
-
-    // release mutex
-    lock.unlock();
   }
   // Task must self-terminate (if ever)
   vTaskDelete(NULL);

src/lamp.cpp

@@ -334,7 +334,7 @@ void Lamp::_switcheffect(effswitch_t action, bool fade, effect_t effnb) {
   // затухание не требуется, переключаемся непосредственно на нужный эффект
   if(opts.flag.wipeOnEffChange || effwrkr.getCurrentEffectNumber() == effect_t::empty){ // для пустышки или для случая когда включена опция - чистим матрицу
     if (display.getCanvas())
-      display.getCanvas()->clear();
+      display.clear();
   }
 
   // if current worker's effect is same as the target one, then I do not need to do actual switch