mirror of
https://github.com/zephyrproject-rtos/zephyr
synced 2025-09-12 23:01:56 +00:00
9c62cc677d
The xtensa-asm2 work included a patch that added nano_internal.h includes in lots of places that needed to have _Swap defined, because it had to break a cycle and this no longer got pulled in from the arch headers. Unfortunately those new includes created new and more amusing cycles elsewhere which led to breakage on other platforms. Break out the _Swap definition (only) into a separate header and use that instead. Cleaner. Seems not to have any more hidden gotchas. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
63 lines
1.3 KiB
C
63 lines
1.3 KiB
C
/*
|
|
* Copyright (c) 2016 Wind River Systems, Inc.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* @brief Primitive for aborting a thread when an arch-specific one is not
|
|
* needed..
|
|
*/
|
|
|
|
#include <kernel.h>
|
|
#include <kernel_structs.h>
|
|
#include <kernel_internal.h>
|
|
#include <nano_internal.h>
|
|
#include <kswap.h>
|
|
#include <string.h>
|
|
#include <toolchain.h>
|
|
#include <linker/sections.h>
|
|
#include <wait_q.h>
|
|
#include <ksched.h>
|
|
#include <misc/__assert.h>
|
|
#include <syscall_handler.h>
|
|
|
|
extern void _k_thread_single_abort(struct k_thread *thread);
|
|
|
|
#if !defined(CONFIG_ARCH_HAS_THREAD_ABORT)
|
|
void _impl_k_thread_abort(k_tid_t thread)
|
|
{
|
|
unsigned int key;
|
|
|
|
key = irq_lock();
|
|
|
|
__ASSERT(!(thread->base.user_options & K_ESSENTIAL),
|
|
"essential thread aborted");
|
|
|
|
_k_thread_single_abort(thread);
|
|
_thread_monitor_exit(thread);
|
|
|
|
if (_current == thread) {
|
|
_Swap(key);
|
|
CODE_UNREACHABLE;
|
|
}
|
|
|
|
/* The abort handler might have altered the ready queue. */
|
|
_reschedule_threads(key);
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_USERSPACE
|
|
_SYSCALL_HANDLER(k_thread_abort, thread_p)
|
|
{
|
|
struct k_thread *thread = (struct k_thread *)thread_p;
|
|
_SYSCALL_OBJ(thread, K_OBJ_THREAD);
|
|
_SYSCALL_VERIFY_MSG(!(thread->base.user_options & K_ESSENTIAL),
|
|
"aborting essential thread %p", thread);
|
|
|
|
_impl_k_thread_abort((struct k_thread *)thread);
|
|
return 0;
|
|
}
|
|
#endif
|