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

small robustness improvement for closeFile()

Browse Source 
Refactor file closing logic to improve concurrency handling: "Consuming" doCloseFile early reduces the risk that several tasks will try to close the same file.
This commit is contained in:
Frank Möhle
2026-03-21 23:46:27 +01:00
committed by GitHub
parent 11b9b6529c
commit 7a0f093ab1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wled00/file.cpp
View File

@@ -47,7 +47,8 @@ void closeFile() {
// --> file reads rarely cause refill stalls compared to writes, but large/fragmented reads can still exceed the ~0.08–0.12 ms budget. // --> file reads rarely cause refill stalls compared to writes, but large/fragmented reads can still exceed the ~0.08–0.12 ms budget.
// esp32 recommendations: use f.setBufferSize() (512–1024 for reads is reasonable); use delay(0) after file reads, to reduce task contention // esp32 recommendations: use f.setBufferSize() (512–1024 for reads is reasonable); use delay(0) after file reads, to reduce task contention
if (!f) {doCloseFile = false; return;} // WLEDMM only do all this hick-hack when f is an open file if (!doCloseFile || !f) { doCloseFile = false; return; } // file not open, or no request to close -> nothing to do, nothing to wait
doCloseFile = false; // consume flag early, to reduce the time window for concurrent closing attempts from several tasks.
bool oldLock = suspendStripService; bool oldLock = suspendStripService;
#if defined(WLEDMM_FILEWAIT) || !defined(ARDUINO_ARCH_ESP32) // only wait if we don't have the flicker-free RMTHI driver #if defined(WLEDMM_FILEWAIT) || !defined(ARDUINO_ARCH_ESP32) // only wait if we don't have the flicker-free RMTHI driver
@@ -80,7 +81,6 @@ void closeFile() {
#endif #endif
suspendStripService = oldLock; // restore previous lock suspendStripService = oldLock; // restore previous lock
DEBUGFS_PRINTF("took %d ms\n", millis() - s); DEBUGFS_PRINTF("took %d ms\n", millis() - s);
doCloseFile = false;
} }
//find() that reads and buffers data from file stream in 256-byte blocks. //find() that reads and buffers data from file stream in 256-byte blocks.