Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

thread: Terminating threads go to zombie state instead of stopped #19197

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

thread: Terminating threads go to zombie state instead of stopped #19197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d8d745
thread: Terminating threads go to zombie state instead of stopped
chrysn Jan 25, 2023
833de50
thread: Zombification is NORETURN when called from threads
chrysn Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/include/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,9 @@ THREAD_MAYBE_INLINE void thread_yield_higher(void);
* but its scheduler entry and stack will be kept.
* A zombie state thread is supposed to be cleaned up
* by @ref thread_kill_zombie().
*
* This function would be NORETURN, but its no-op behavior inside an
* ISR precludes such an annotation.
*/
void thread_zombify(void);

Expand Down
7 changes: 3 additions & 4 deletions core/sched.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,9 @@ NORETURN void sched_task_exit(void)
sched_threads[thread_getpid()] = NULL;
sched_num_threads--;

sched_set_status(thread_get_active(), STATUS_STOPPED);

sched_active_thread = NULL;
cpu_switch_context_exit();
thread_zombify();
/* We're in a thread, so thread_zombify is really NORETURN. */
UNREACHABLE();
}

#ifdef MODULE_SCHED_CB
Expand Down