Skip to content

Enhance ASSERT #13118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acassis merged 3 commits into from
Aug 23, 2024
Merged

Enhance ASSERT #13118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f328181
assert: Avoid recursive calls of Assert
Gary-Hobson Dec 27, 2023
7efe121
assert: pause all other CPUs when assert
Gary-Hobson Jan 11, 2024
2a1571b
sched: support dumping all file information during assert
Gary-Hobson Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions sched/misc/assert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/coredump.h>
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
#include <nuttx/tls.h>
#include <nuttx/signal.h>
Expand Down Expand Up @@ -104,6 +105,8 @@ static FAR const char * const g_ttypenames[4] =
"Invalid"
};

static bool g_fatal_assert = false;

/****************************************************************************
* Private Functions
****************************************************************************/
Expand Down Expand Up @@ -412,6 +415,18 @@ static void dump_backtrace(FAR struct tcb_s *tcb, FAR void *arg)
}
#endif

/****************************************************************************
* Name: dump_filelist
****************************************************************************/

#ifdef CONFIG_SCHED_DUMP_ON_EXIT
static void dump_filelist(FAR struct tcb_s *tcb, FAR void *arg)
{
FAR struct filelist *filelist = &tcb->group->tg_filelist;
files_dumplist(filelist);
}
#endif

/****************************************************************************
* Name: dump_tasks
****************************************************************************/
Expand Down Expand Up @@ -493,6 +508,10 @@ static void dump_tasks(void)
#ifdef CONFIG_SCHED_BACKTRACE
nxsched_foreach(dump_backtrace, NULL);
#endif

#ifdef CONFIG_SCHED_DUMP_ON_EXIT
nxsched_foreach(dump_filelist, NULL);
#endif
}

/****************************************************************************
Expand Down Expand Up @@ -520,6 +539,25 @@ static void dump_deadlock(void)
}
#endif

/****************************************************************************
* Name: pause_all_cpu
****************************************************************************/

#ifdef CONFIG_SMP
static void pause_all_cpu(void)
{
int cpu;

for (cpu = 0; cpu < CONFIG_SMP_NCPUS; cpu++)
{
if (cpu != this_cpu())
{
up_cpu_pause(cpu);
}
}
}
#endif

/****************************************************************************
* Public Functions
****************************************************************************/
Expand Down Expand Up @@ -549,6 +587,18 @@ void _assert(FAR const char *filename, int linenum,

flags = enter_critical_section();

if (g_fatal_assert)
{
goto reset;
}

if (fatal)
{
#ifdef CONFIG_SMP
pause_all_cpu();
#endif
}

/* try to save current context if regs is null */

if (regs == NULL)
Expand All @@ -567,7 +617,11 @@ void _assert(FAR const char *filename, int linenum,
{
fatal = false;
}
else
#endif
{
g_fatal_assert = true;
}

notifier_data.rtcb = rtcb;
notifier_data.regs = regs;
Expand Down Expand Up @@ -666,6 +720,7 @@ void _assert(FAR const char *filename, int linenum,

reboot_notifier_call_chain(SYS_HALT, NULL);

reset:
#if CONFIG_BOARD_RESET_ON_ASSERT >= 1
board_reset(CONFIG_BOARD_ASSERT_RESET_VALUE);
#else
Expand Down