From 95be6d2b1fc49af54828a5c3484a8a89b4f75649 Mon Sep 17 00:00:00 2001 From: Dmitry Chagin Date: Sun, 24 May 2015 14:36:33 +0000 Subject: [PATCH] In preparation for switching linuxulator to the use the native 1:1 threads split sys_thr_exit() up into sys_thr_exit() and kern_thr_exit(). Move Where the second will be used in linux_exit() system call later. Differential Revision: https://reviews.freebsd.org/D1028 Reviewed by: trasz --- sys/kern/kern_thr.c | 14 ++++++++++---- sys/sys/syscallsubr.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 6911bb97b3df..e686b2278fd6 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -307,9 +307,6 @@ int sys_thr_exit(struct thread *td, struct thr_exit_args *uap) /* long *state */ { - struct proc *p; - - p = td->td_proc; /* Signal userland that it can free the stack. */ if ((void *)uap->state != NULL) { @@ -317,8 +314,17 @@ sys_thr_exit(struct thread *td, struct thr_exit_args *uap) kern_umtx_wake(td, uap->state, INT_MAX, 0); } - rw_wlock(&tidhash_lock); + return (kern_thr_exit(td)); +} +int +kern_thr_exit(struct thread *td) +{ + struct proc *p; + + p = td->td_proc; + + rw_wlock(&tidhash_lock); PROC_LOCK(p); if (p->p_numthreads != 1) { diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 8d8c1736bcac..8d62eaa4608b 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -214,6 +214,7 @@ int kern_ktimer_settime(struct thread *td, int timer_id, int flags, int kern_ktimer_gettime(struct thread *td, int timer_id, struct itimerspec *val); int kern_ktimer_getoverrun(struct thread *td, int timer_id); +int kern_thr_exit(struct thread *td); int kern_thr_new(struct thread *td, struct thr_param *param); int kern_thr_suspend(struct thread *td, struct timespec *tsp); int kern_truncate(struct thread *td, char *path, enum uio_seg pathseg,