blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/task_wdt_freertos_smp_unicore_build' into 'master'

Browse Source 
esp_system: FIx TWDT SMP FreeRTOS unicore build error

See merge request espressif/esp-idf!18241
This commit is contained in:
Darian 2022-05-26 09:20:33 +08:00
commit 3b57f6d40c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/esp_system/task_wdt.c
View File

@ -346,9 +346,14 @@ static void task_wdt_isr(void *arg)
if (!entry->has_reset) {
if (entry->task_handle) {
#if CONFIG_FREERTOS_SMP
UBaseType_t uxCoreAffinity = vTaskCoreAffinityGet(entry->task_handle);
ESP_EARLY_LOGE(TAG, " - %s (0x%x)", pcTaskGetName(entry->task_handle), uxCoreAffinity);
#else
#if configNUM_CORES > 1
// Log the task's name and its affinity
ESP_EARLY_LOGE(TAG, " - %s (0x%x)", pcTaskGetName(entry->task_handle), vTaskCoreAffinityGet(entry->task_handle));
#else // configNUM_CORES > 1
// Log the task's name
ESP_EARLY_LOGE(TAG, " - %s", pcTaskGetName(entry->task_handle));
#endif // configNUM_CORES > 1
#else // CONFIG_FREERTOS_SMP
BaseType_t task_affinity = xTaskGetAffinity(entry->task_handle);
const char *cpu;
if (task_affinity == 0) {
@ -359,7 +364,7 @@ static void task_wdt_isr(void *arg)
cpu = DRAM_STR("CPU 0/1");
}
ESP_EARLY_LOGE(TAG, " - %s (%s)", pcTaskGetName(entry->task_handle), cpu);
#endif
#endif // CONFIG_FREERTOS_SMP
} else {
ESP_EARLY_LOGE(TAG, " - %s", entry->user_name);
}