diff options
| author | Benjamin Walsh <benjamin.walsh@windriver.com> | 2016-10-26 14:09:23 -0400 |
|---|---|---|
| committer | Anas Nashif <nashif@linux.intel.com> | 2016-10-26 23:38:14 +0000 |
| commit | 115d118a2e24dc1d9cd5a813ccf8b8e7cde8bb4d (patch) | |
| tree | 81d73457e1d5ed0bfcbece9f2a25d1bb91bac6db /kernel | |
| parent | 14ec7af62c504760144f08714665ca2caad8295e (diff) | |
unified: remove mention of 'fiber' in kernel_event_logger
Adapting to unified kernel naming of 'coop thread'.
Change-Id: I66cb766c2269acf0867e434bc21f633ea1111f89
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/unified/kernel_event_logger.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/kernel/unified/kernel_event_logger.c b/kernel/unified/kernel_event_logger.c index becb0d7f8..b5f3b6638 100644 --- a/kernel/unified/kernel_event_logger.c +++ b/kernel/unified/kernel_event_logger.c @@ -25,11 +25,12 @@ #include <init.h> #include <nano_private.h> #include <kernel_event_logger_arch.h> +#include <misc/__assert.h> uint32_t _sys_k_event_logger_buffer[CONFIG_KERNEL_EVENT_LOGGER_BUFFER_SIZE]; #ifdef CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH -void *_collector_fiber; +void *_collector_coop_thread; #endif #ifdef CONFIG_KERNEL_EVENT_LOGGER_SLEEP @@ -100,7 +101,7 @@ void _sys_k_event_logger_context_switch(void) return; } - if (_collector_fiber == _nanokernel.current) { + if (_collector_coop_thread == _nanokernel.current) { return; } @@ -129,9 +130,19 @@ void _sys_k_event_logger_context_switch(void) ARRAY_SIZE(data)); } +#ifdef CONFIG_KERNEL_V2 +#define ASSERT_CURRENT_IS_COOP_THREAD() \ + __ASSERT(_current.prio < 0, "must be a coop thread") +#else +#define ASSERT_CURRENT_IS_COOP_THREAD() \ + __ASSERT(_nanokernel.current->flags & FIBER, "must be a fiber") +#endif + void sys_k_event_logger_register_as_collector(void) { - _collector_fiber = _nanokernel.current; + ASSERT_CURRENT_IS_COOP_THREAD(); + + _collector_coop_thread = _nanokernel.current; } #endif /* CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH */ |