Author: kib
Date: Wed Sep 10 09:47:16 2014
New Revision: 271372
URL: http://svnweb.freebsd.org/changeset/base/271372
Log:
MFC r271000:
Delay the return from thread_single(SINGLE_EXIT) until all threads are
really destroyed by thread_stash() after the last switch out.
MFC r271007:
Retire thread_unthread().
MFC r271008:
Style.
Approved by: re (marius)
Modified:
stable/10/sys/kern/kern_thread.c
stable/10/sys/sys/proc.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_thread.c
==============================================================================
--- stable/10/sys/kern/kern_thread.c Wed Sep 10 09:42:10 2014
(r271371)
+++ stable/10/sys/kern/kern_thread.c Wed Sep 10 09:47:16 2014
(r271372)
@@ -433,6 +433,7 @@ thread_exit(void)
*/
if (p->p_flag & P_HADTHREADS) {
if (p->p_numthreads > 1) {
+ atomic_add_int(&td->td_proc->p_exitthreads, 1);
thread_unlink(td);
td2 = FIRST_THREAD_IN_PROC(p);
sched_exit_thread(td2, td);
@@ -453,7 +454,6 @@ thread_exit(void)
}
}
- atomic_add_int(&td->td_proc->p_exitthreads, 1);
PCPU_SET(deadthread, td);
} else {
/*
@@ -508,14 +508,12 @@ thread_wait(struct proc *p)
struct thread *td;
mtx_assert(&Giant, MA_NOTOWNED);
- KASSERT((p->p_numthreads == 1), ("Multiple threads in wait1()"));
+ KASSERT(p->p_numthreads == 1, ("multiple threads in thread_wait()"));
+ KASSERT(p->p_exitthreads == 0, ("p_exitthreads leaking"));
td = FIRST_THREAD_IN_PROC(p);
/* Lock the last thread so we spin until it exits cpu_throw(). */
thread_lock(td);
thread_unlock(td);
- /* Wait for any remaining threads to exit cpu_throw(). */
- while (p->p_exitthreads)
- sched_relinquish(curthread);
lock_profile_thread_exit(td);
cpuset_rel(td->td_cpuset);
td->td_cpuset = NULL;
@@ -552,18 +550,6 @@ thread_link(struct thread *td, struct pr
}
/*
- * Convert a process with one thread to an unthreaded process.
- */
-void
-thread_unthread(struct thread *td)
-{
- struct proc *p = td->td_proc;
-
- KASSERT((p->p_numthreads == 1), ("Unthreading with >1 threads"));
- p->p_flag &= ~P_HADTHREADS;
-}
-
-/*
* Called from:
* thread_exit()
*/
@@ -715,14 +701,24 @@ stopme:
}
if (mode == SINGLE_EXIT) {
/*
- * We have gotten rid of all the other threads and we
- * are about to either exit or exec. In either case,
- * we try our utmost to revert to being a non-threaded
- * process.
+ * Convert the process to an unthreaded process. The
+ * SINGLE_EXIT is called by exit1() or execve(), in
+ * both cases other threads must be retired.
*/
+ KASSERT(p->p_numthreads == 1, ("Unthreading with >1 threads"));
p->p_singlethread = NULL;
- p->p_flag &= ~(P_STOPPED_SINGLE | P_SINGLE_EXIT);
- thread_unthread(td);
+ p->p_flag &= ~(P_STOPPED_SINGLE | P_SINGLE_EXIT | P_HADTHREADS);
+
+ /*
+ * Wait for any remaining threads to exit cpu_throw().
+ */
+ while (p->p_exitthreads != 0) {
+ PROC_SUNLOCK(p);
+ PROC_UNLOCK(p);
+ sched_relinquish(td);
+ PROC_LOCK(p);
+ PROC_SLOCK(p);
+ }
}
PROC_SUNLOCK(p);
return (0);
Modified: stable/10/sys/sys/proc.h
==============================================================================
--- stable/10/sys/sys/proc.h Wed Sep 10 09:42:10 2014 (r271371)
+++ stable/10/sys/sys/proc.h Wed Sep 10 09:47:16 2014 (r271372)
@@ -952,7 +952,6 @@ void thread_suspend_one(struct thread *t
void thread_unlink(struct thread *td);
void thread_unsuspend(struct proc *p);
int thread_unsuspend_one(struct thread *td);
-void thread_unthread(struct thread *td);
void thread_wait(struct proc *p);
struct thread *thread_find(struct proc *p, lwpid_t tid);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
