Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

debug message when realtimeLock fails, and fixing a few typos

Browse Source
This commit is contained in:
Frank
2025-12-22 01:21:33 +01:00
parent f510bb075c
commit 6993de1c8a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wled00/udp.cpp
View File

@@ -211,7 +211,7 @@ void realtimeLock(uint32_t timeoutMs, byte md)
// WLEDMM cache current "main segment" // WLEDMM cache current "main segment"
if (esp32SemTake(busDrawMux, 1200) == pdTRUE) { // stupid long timeout, but we don't want to wait forever if (esp32SemTake(busDrawMux, 1200) == pdTRUE) { // stupid long timeout, but we don't want to wait forever
// WLEDMM protect against parallel cache updates from different tasks // WLEDMM protect against parallel cache updates from different tasks
// positive side-effect: this also introduces a wait if other bus activities are happeening in parallel // positive side effect: this also introduces a wait if other bus activities are happening in parallel
Segment& mainSegRef = strip.getMainSegment(); Segment& mainSegRef = strip.getMainSegment();
theMainSeg = &mainSegRef; //convert from reference to pointer theMainSeg = &mainSegRef; //convert from reference to pointer
if (realtimeOverride && !(realtimeMode && useMainSegmentOnly)) { if (realtimeOverride && !(realtimeMode && useMainSegmentOnly)) {
@@ -223,6 +223,13 @@ void realtimeLock(uint32_t timeoutMs, byte md)
theStripLength = strip.getLengthTotal(); theStripLength = strip.getLengthTotal();
} }
esp32SemGive(busDrawMux); esp32SemGive(busDrawMux);
} else {
// mutex acquisition failed, log debug message and pretend we are in override mode
DEBUG_PRINTLN(F("realtimeLock: failed to acquire busDrawMux for cache update."));
// clear cache to prevent stale pointer usage
theMainSeg = nullptr;
theMainSegLength = 0;
theStripLength = 0;
} }
if (realtimeOverride) return; if (realtimeOverride) return;
@@ -244,7 +251,7 @@ void exitRealtime() {
} else { } else {
strip.show(); // possible fix for #3589 strip.show(); // possible fix for #3589
} }
// WLEDMM invalide cached main segment pointer and length // WLEDMM invalidate cached main segment pointer and length
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
portENTER_CRITICAL(&critical_lock); // critical section to make cache reset atomic and thread-safe portENTER_CRITICAL(&critical_lock); // critical section to make cache reset atomic and thread-safe
#endif #endif