Page MenuHomeFreeBSD
Files F115611213

D49984.id154176.diff
No OneTemporary
Actions

D49984.id154176.diff
View Options

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -108,7 +108,7 @@
static void reschedule_signals(struct proc *p, sigset_t block, int flags);
static int sigprop(int sig);
static void tdsigwakeup(struct thread *, int, sig_t, int);
-static void sig_suspend_threads(struct thread *, struct proc *);
+static bool sig_suspend_threads(struct thread *, struct proc *);
static int filt_sigattach(struct knote *kn);
static void filt_sigdetach(struct knote *kn);
static int filt_signal(struct knote *kn, long hint);
@@ -2799,14 +2799,24 @@
wakeup(p);
}
-static void
+/*
+ * Suspend threads of the process p, either by directly setting the
+ * inhibitor for the thread sleeping interruptibly, or by making the
+ * thread to suspend at boundary by scheduling suspend AST, otherwise.
+ *
+ * Returns true if some threads were suspended directly from the
+ * sleeping state, and false if all threads are forced to process AST.
+ */
+static bool
sig_suspend_threads(struct thread *td, struct proc *p)
{
struct thread *td2;
+ bool res;
PROC_LOCK_ASSERT(p, MA_OWNED);
PROC_SLOCK_ASSERT(p, MA_OWNED);
+ res = false;
FOREACH_THREAD_IN_PROC(p, td2) {
thread_lock(td2);
ast_sched_locked(td2, TDA_SUSPEND);
@@ -2824,8 +2834,10 @@
sleepq_abort(td2, TD_SBDRY_ERRNO(td2));
continue;
}
- } else if (!TD_IS_SUSPENDED(td2))
+ } else if (!TD_IS_SUSPENDED(td2)) {
thread_suspend_one(td2);
+ res = true;
+ }
} else if (!TD_IS_SUSPENDED(td2)) {
#ifdef SMP
if (TD_IS_RUNNING(td2) && td2 != td)
@@ -2834,6 +2846,7 @@
}
thread_unlock(td2);
}
+ return (res);
}
static void
@@ -2855,7 +2868,8 @@
p->p_flag2 &= ~P2_PTRACE_FSTP;
p->p_flag |= P_STOPPED_SIG | P_STOPPED_TRACE;
- sig_suspend_threads(td, p);
+ if (sig_suspend_threads(td, p) && td == NULL)
+ thread_stopped(p);
}
/*

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 11:39 PM (10 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17762815
Default Alt Text
D49984.id154176.diff (1 KB)

Event Timeline