cottongin/crosspoint-reader
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Add semaphore to safely delete mutex

Browse Source
This commit is contained in:
Brendan O'Leary 2025-12-18 21:40:12 -05:00
parent 18086ef5ee
commit e2dab0d811
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/activities/network/WifiScreen.cpp
View File

@ -79,7 +79,12 @@ void WifiScreen::onExit() {
Serial.printf("[%lu] [WIFI] [MEM] Free heap after WiFi disconnect: %d bytes\n", millis(), ESP.getFreeHeap()); Serial.printf("[%lu] [WIFI] [MEM] Free heap after WiFi disconnect: %d bytes\n", millis(), ESP.getFreeHeap());
// Delete the display task // Acquire mutex before deleting task to ensure task isn't using it
// This prevents hangs/crashes if the task holds the mutex when deleted
Serial.printf("[%lu] [WIFI] Acquiring rendering mutex before task deletion...\n", millis());
xSemaphoreTake(renderingMutex, portMAX_DELAY);
// Delete the display task (we now hold the mutex, so task is blocked if it needs it)
Serial.printf("[%lu] [WIFI] Deleting display task...\n", millis()); Serial.printf("[%lu] [WIFI] Deleting display task...\n", millis());
if (displayTaskHandle) { if (displayTaskHandle) {
vTaskDelete(displayTaskHandle); vTaskDelete(displayTaskHandle);
@ -87,17 +92,11 @@ void WifiScreen::onExit() {
Serial.printf("[%lu] [WIFI] Display task deleted\n", millis()); Serial.printf("[%lu] [WIFI] Display task deleted\n", millis());
} }
// Small delay to ensure task is fully deleted before cleaning up mutex // Now safe to delete the mutex since we own it
Serial.printf("[%lu] [WIFI] Waiting for task cleanup...\n", millis());
vTaskDelay(10 / portTICK_PERIOD_MS);
// Now safe to delete the mutex
Serial.printf("[%lu] [WIFI] Deleting mutex...\n", millis()); Serial.printf("[%lu] [WIFI] Deleting mutex...\n", millis());
if (renderingMutex) { vSemaphoreDelete(renderingMutex);
vSemaphoreDelete(renderingMutex); renderingMutex = nullptr;
renderingMutex = nullptr; Serial.printf("[%lu] [WIFI] Mutex deleted\n", millis());
Serial.printf("[%lu] [WIFI] Mutex deleted\n", millis());
}
Serial.printf("[%lu] [WIFI] [MEM] Free heap at onExit end: %d bytes\n", millis(), ESP.getFreeHeap()); Serial.printf("[%lu] [WIFI] [MEM] Free heap at onExit end: %d bytes\n", millis(), ESP.getFreeHeap());
Serial.printf("[%lu] [WIFI] ========== onExit COMPLETE ==========\n", millis()); Serial.printf("[%lu] [WIFI] ========== onExit COMPLETE ==========\n", millis());