michaelh/zephyr
1
0
Fork 0
Code Releases Activity

misc: Add k_panic on assert

Browse source 
Replaced forever loop in assert with call to a function.
In post_assert_action() function, k_panic is called.

Forever loop was preventing logs to be printed and had behavior
ependent on the context (low prioriy thread - system continue to
ork, irq - system is blocked).

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2019-01-25 13:56:10 +01:00 • committed by Andrew Boie
commit 6904501173
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
include/misc/__assert.h
View file

@ -81,16 +81,7 @@
#if __ASSERT_ON
#include <misc/printk.h>
#if defined(CONFIG_ARCH_POSIX)
extern void posix_exit(int exit_code);
#define __ASSERT_POST posix_exit(1)
#else
#define __ASSERT_POST \
for (;;) { \
/* spin thread */ \
}
#endif
void assert_post_action(void);
#define __ASSERT_LOC(test) \
printk("ASSERTION FAIL [%s] @ %s:%d\n", \
@ -102,7 +93,7 @@ extern void posix_exit(int exit_code);
do { \
if (!(test)) { \
__ASSERT_LOC(test); \
__ASSERT_POST; \
assert_post_action(); \
} \
} while (false)
@ -110,8 +101,8 @@ extern void posix_exit(int exit_code);
do { \
if (!(test)) { \
__ASSERT_LOC(test); \
printk("\t" fmt "\n", ##__VA_ARGS__); \
__ASSERT_POST; \
printk("\t" fmt "\n", ##__VA_ARGS__); \
assert_post_action(); \
} \
} while (false)

2
lib/os/CMakeLists.txt
View file

@ -17,3 +17,5 @@ zephyr_sources_ifdef(CONFIG_JSON_LIBRARY json.c)
zephyr_sources_if_kconfig(printk.c)
zephyr_sources_if_kconfig(ring_buffer.c)
zephyr_sources_ifdef(CONFIG_ASSERT assert.c)

18
lib/os/assert.c Normal file
View file

@ -0,0 +1,18 @@
/*
* Copyright (c) 2019 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <misc/__assert.h>
#include <zephyr.h>
void assert_post_action(void)
{
if (IS_ENABLED(CONFIG_ARCH_POSIX)) {
extern void posix_exit(int exit_code);
posix_exit(1);
} else {
k_panic();
}
}