2d7460482d
This commit refactors kernel and arch headers to establish a boundary
between private and public interface headers.
The refactoring strategy used in this commit is detailed in the issue
This commit introduces the following major changes:
1. Establish a clear boundary between private and public headers by
removing "kernel/include" and "arch/*/include" from the global
include paths. Ideally, only kernel/ and arch/*/ source files should
reference the headers in these directories. If these headers must be
used by a component, these include paths shall be manually added to
the CMakeLists.txt file of the component. This is intended to
discourage applications from including private kernel and arch
headers either knowingly and unknowingly.
- kernel/include/ (PRIVATE)
This directory contains the private headers that provide private
kernel definitions which should not be visible outside the kernel
and arch source code. All public kernel definitions must be added
to an appropriate header located under include/.
- arch/*/include/ (PRIVATE)
This directory contains the private headers that provide private
architecture-specific definitions which should not be visible
outside the arch and kernel source code. All public architecture-
specific definitions must be added to an appropriate header located
under include/arch/*/.
- include/ AND include/sys/ (PUBLIC)
This directory contains the public headers that provide public
kernel definitions which can be referenced by both kernel and
application code.
- include/arch/*/ (PUBLIC)
This directory contains the public headers that provide public
architecture-specific definitions which can be referenced by both
kernel and application code.
2. Split arch_interface.h into "kernel-to-arch interface" and "public
arch interface" divisions.
- kernel/include/kernel_arch_interface.h
* provides private "kernel-to-arch interface" definition.
* includes arch/*/include/kernel_arch_func.h to ensure that the
interface function implementations are always available.
* includes sys/arch_interface.h so that public arch interface
definitions are automatically included when including this file.
- arch/*/include/kernel_arch_func.h
* provides architecture-specific "kernel-to-arch interface"
implementation.
* only the functions that will be used in kernel and arch source
files are defined here.
- include/sys/arch_interface.h
* provides "public arch interface" definition.
* includes include/arch/arch_inlines.h to ensure that the
architecture-specific public inline interface function
implementations are always available.
- include/arch/arch_inlines.h
* includes architecture-specific arch_inlines.h in
include/arch/*/arch_inline.h.
- include/arch/*/arch_inline.h
* provides architecture-specific "public arch interface" inline
function implementation.
* supersedes include/sys/arch_inline.h.
3. Refactor kernel and the existing architecture implementations.
- Remove circular dependency of kernel and arch headers. The
following general rules should be observed:
* Never include any private headers from public headers
* Never include kernel_internal.h in kernel_arch_data.h
* Always include kernel_arch_data.h from kernel_arch_func.h
* Never include kernel.h from kernel_struct.h either directly or
indirectly. Only add the kernel structures that must be referenced
from public arch headers in this file.
- Relocate syscall_handler.h to include/ so it can be used in the
public code. This is necessary because many user-mode public codes
reference the functions defined in this header.
- Relocate kernel_arch_thread.h to include/arch/*/thread.h. This is
necessary to provide architecture-specific thread definition for
'struct k_thread' in kernel.h.
- Remove any private header dependencies from public headers using
the following methods:
* If dependency is not required, simply omit
* If dependency is required,
- Relocate a portion of the required dependencies from the
private header to an appropriate public header OR
- Relocate the required private header to make it public.
This commit supersedes #20047, addresses #19666, and fixes #3056.
Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
65 lines
1.6 KiB
C
65 lines
1.6 KiB
C
/*
|
|
* Copyright (c) 2018 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
#ifndef _TRACE_SYSVIEW_H
|
|
#define _TRACE_SYSVIEW_H
|
|
#include <kernel.h>
|
|
#include <init.h>
|
|
|
|
#include <SEGGER_SYSVIEW.h>
|
|
#include <Global.h>
|
|
#include "SEGGER_SYSVIEW_Zephyr.h"
|
|
|
|
void sys_trace_thread_switched_in(void);
|
|
void sys_trace_thread_switched_out(void);
|
|
void sys_trace_isr_enter(void);
|
|
void sys_trace_isr_exit(void);
|
|
void sys_trace_isr_exit_to_scheduler(void);
|
|
void sys_trace_idle(void);
|
|
|
|
#define sys_trace_thread_priority_set(thread)
|
|
|
|
static inline void sys_trace_thread_info(struct k_thread *thread)
|
|
{
|
|
char name[20];
|
|
|
|
snprintk(name, sizeof(name), "T%pE%p", thread, &thread->entry);
|
|
|
|
SEGGER_SYSVIEW_TASKINFO Info;
|
|
|
|
Info.TaskID = (u32_t)(uintptr_t)thread;
|
|
Info.sName = name;
|
|
Info.Prio = thread->base.prio;
|
|
Info.StackBase = thread->stack_info.size;
|
|
Info.StackSize = thread->stack_info.start;
|
|
SEGGER_SYSVIEW_SendTaskInfo(&Info);
|
|
}
|
|
|
|
#define sys_trace_thread_create(thread) \
|
|
do { \
|
|
SEGGER_SYSVIEW_OnTaskCreate((u32_t)(uintptr_t)thread); \
|
|
sys_trace_thread_info(thread); \
|
|
} while (0)
|
|
|
|
#define sys_trace_thread_name_set(thread)
|
|
|
|
#define sys_trace_thread_abort(thread)
|
|
|
|
#define sys_trace_thread_suspend(thread)
|
|
|
|
#define sys_trace_thread_resume(thread)
|
|
|
|
#define sys_trace_thread_ready(thread) \
|
|
SEGGER_SYSVIEW_OnTaskStartReady((u32_t)(uintptr_t)thread)
|
|
|
|
#define sys_trace_thread_pend(thread) \
|
|
SEGGER_SYSVIEW_OnTaskStopReady((u32_t)(uintptr_t)thread, 3 << 3)
|
|
|
|
#define sys_trace_void(id) SEGGER_SYSVIEW_RecordVoid(id)
|
|
|
|
#define sys_trace_end_call(id) SEGGER_SYSVIEW_RecordEndCall(id)
|
|
|
|
#endif /* _TRACE_SYSVIEW_H */
|