sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

assert: disable function/line print if DEBUG_ASSERTIONS_FILENAME disabled

Browse Source 
Test on sim/nsh:
(CONFIG_DEBUG_ASSERTIONS=y CONFIG_DEFAULT_SMALL=y)
   text	   data	    bss	    dec	    hex	filename
 423626	  27152	   4128	 454906	  6f0fa	nuttx     /* before */
 417010	  27152	   4128	 448290	  6d722	nuttx     /* after */
  -6616

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2023-06-08 22:08:23 +08:00 committed by Xiang Xiao
parent 2369e3cbc8
commit 3ce2796175
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Kconfig
View File

@ -665,6 +665,15 @@ config DEBUG_ASSERTIONS_EXPRESSION
function when it is triggered. This option maybe will take up a lot
of space.
config DEBUG_ASSERTIONS_FILENAME
bool "Enable Debug Assertions show file name"
default !DEFAULT_SMALL
depends on DEBUG_ASSERTIONS
---help---
This option can display the file information of the ASSERT()
function when it is enabled. This option maybe will take up a lot
of space.
comment "Subsystem Debug Options"
config DEBUG_AUDIO

26
include/assert.h
View File

@ -42,20 +42,25 @@
#undef DEBUGASSERT /* Like ASSERT, but only if CONFIG_DEBUG_ASSERTIONS is defined */
#undef DEBUGVERIFY /* Like VERIFY, but only if CONFIG_DEBUG_ASSERTIONS is defined */
#ifndef CONFIG_HAVE_FILENAME
# define __FILE__ 0
# define __LINE__ 0
#if !defined(CONFIG_HAVE_FILENAME) || !defined(CONFIG_DEBUG_ASSERTIONS_FILENAME)
# define __ASSERT_FILE__ 0
# define __ASSERT_LINE__ 0
#else
# define __ASSERT_FILE__ __FILE__
# define __ASSERT_LINE__ __LINE__
#endif
#define PANIC() __assert(__FILE__, __LINE__, "panic")
#define PANIC_WITH_REGS(msg, regs) _assert(__FILE__, __LINE__, msg, regs)
#define PANIC() __assert(__ASSERT_FILE__, __ASSERT_LINE__, "panic")
#define PANIC_WITH_REGS(msg, regs) _assert(__ASSERT_FILE__, \
__ASSERT_LINE__, msg, regs)
#ifdef CONFIG_DEBUG_ASSERTIONS_EXPRESSION
# define ASSERT(f) \
do \
{ \
if (predict_false(!(f))) \
__assert(__FILE__, __LINE__, #f); \
__assert(__ASSERT_FILE__, \
__ASSERT_LINE__, #f); \
} \
while (0)
@ -63,7 +68,8 @@
do \
{ \
if (predict_false((f) < 0)) \
__assert(__FILE__, __LINE__, #f); \
__assert(__ASSERT_FILE__, \
__ASSERT_LINE__, #f); \
} \
while (0)
#else
@ -71,7 +77,8 @@
do \
{ \
if (predict_false(!(f))) \
__assert(__FILE__, __LINE__, 0); \
__assert(__ASSERT_FILE__, \
__ASSERT_LINE__, 0); \
} \
while (0)
@ -79,7 +86,8 @@
do \
{ \
if (predict_false((f) < 0)) \
__assert(__FILE__, __LINE__, 0); \
__assert(__ASSERT_FILE__, \
__ASSERT_LINE__, 0); \
} \
while (0)
#endif

3
include/debug.h
View File

@ -78,7 +78,8 @@
* really intended only for crash error reporting.
*/
#if !defined(EXTRA_FMT) && !defined(EXTRA_ARG) && defined(CONFIG_HAVE_FUNCTIONNAME)
#if !defined(EXTRA_FMT) && !defined(EXTRA_ARG) && \
defined(CONFIG_HAVE_FUNCTIONNAME) && !defined(CONFIG_DEFAULT_SMALL)
# define EXTRA_FMT "%s: "
# define EXTRA_ARG ,__FUNCTION__
#endif