Make sure task wdt also does the right thing when triggered when flash is disabled
This commit is contained in:
parent
02f5bb9442
commit
d73448f57f
2 changed files with 12 additions and 7 deletions
|
@ -26,6 +26,10 @@
|
||||||
// Forces data into DRAM instead of flash
|
// Forces data into DRAM instead of flash
|
||||||
#define DRAM_ATTR __attribute__((section(".dram1")))
|
#define DRAM_ATTR __attribute__((section(".dram1")))
|
||||||
|
|
||||||
|
// Forces a string into DRAM instrad of flash
|
||||||
|
// Use as ets_printf(DRAM_STR("Hello world!\n"));
|
||||||
|
#define DRAM_STR(str) (__extension__({static const DRAM_ATTR char __c[] = (str); (const char *)&__c;}))
|
||||||
|
|
||||||
// Forces code into RTC fast memory. See "docs/deep-sleep-stub.rst"
|
// Forces code into RTC fast memory. See "docs/deep-sleep-stub.rst"
|
||||||
#define RTC_IRAM_ATTR __attribute__((section(".rtc.text")))
|
#define RTC_IRAM_ATTR __attribute__((section(".rtc.text")))
|
||||||
|
|
||||||
|
|
|
@ -49,6 +49,7 @@ struct wdt_task_t {
|
||||||
static wdt_task_t *wdt_task_list=NULL;
|
static wdt_task_t *wdt_task_list=NULL;
|
||||||
static portMUX_TYPE taskwdt_spinlock = portMUX_INITIALIZER_UNLOCKED;
|
static portMUX_TYPE taskwdt_spinlock = portMUX_INITIALIZER_UNLOCKED;
|
||||||
|
|
||||||
|
|
||||||
static void IRAM_ATTR task_wdt_isr(void *arg) {
|
static void IRAM_ATTR task_wdt_isr(void *arg) {
|
||||||
wdt_task_t *wdttask;
|
wdt_task_t *wdttask;
|
||||||
const char *cpu;
|
const char *cpu;
|
||||||
|
@ -69,21 +70,21 @@ static void IRAM_ATTR task_wdt_isr(void *arg) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//Watchdog got triggered because at least one task did not report in.
|
//Watchdog got triggered because at least one task did not report in.
|
||||||
ets_printf("Task watchdog got triggered. The following tasks did not feed the watchdog in time:\n");
|
ets_printf(DRAM_STR("Task watchdog got triggered. The following tasks did not feed the watchdog in time:\n"));
|
||||||
for (wdttask=wdt_task_list; wdttask!=NULL; wdttask=wdttask->next) {
|
for (wdttask=wdt_task_list; wdttask!=NULL; wdttask=wdttask->next) {
|
||||||
if (!wdttask->fed_watchdog) {
|
if (!wdttask->fed_watchdog) {
|
||||||
cpu=xTaskGetAffinity(wdttask->task_handle)==0?"CPU 0":"CPU 1";
|
cpu=xTaskGetAffinity(wdttask->task_handle)==0?DRAM_STR("CPU 0"):DRAM_STR("CPU 1");
|
||||||
if (xTaskGetAffinity(wdttask->task_handle)==tskNO_AFFINITY) cpu="CPU 0/1";
|
if (xTaskGetAffinity(wdttask->task_handle)==tskNO_AFFINITY) cpu=DRAM_STR("CPU 0/1");
|
||||||
ets_printf(" - %s (%s)\n", pcTaskGetTaskName(wdttask->task_handle), cpu);
|
ets_printf(DRAM_STR(" - %s (%s)\n"), pcTaskGetTaskName(wdttask->task_handle), cpu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ets_printf("Tasks currently running:\n");
|
ets_printf(DRAM_STR("Tasks currently running:\n"));
|
||||||
for (int x=0; x<portNUM_PROCESSORS; x++) {
|
for (int x=0; x<portNUM_PROCESSORS; x++) {
|
||||||
ets_printf("CPU %d: %s\n", x, pcTaskGetTaskName(xTaskGetCurrentTaskHandleForCPU(x)));
|
ets_printf(DRAM_STR("CPU %d: %s\n"), x, pcTaskGetTaskName(xTaskGetCurrentTaskHandleForCPU(x)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#if CONFIG_TASK_WDT_PANIC
|
#if CONFIG_TASK_WDT_PANIC
|
||||||
ets_printf("Aborting.\n");
|
ets_printf(DRAM_STR("Aborting.\n"));
|
||||||
abort();
|
abort();
|
||||||
#endif
|
#endif
|
||||||
portEXIT_CRITICAL(&taskwdt_spinlock);
|
portEXIT_CRITICAL(&taskwdt_spinlock);
|
||||||
|
|
Loading…
Reference in a new issue