d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a 'p' variable instead of repetitively indirecting td->td_proc for

Browse Source 
signal things that are still per-process and won't be per-thread.
This commit is contained in:
John Baldwin 2001-09-18 23:27:06 +00:00
parent f5b93d4aac
commit 9ef3a9855d
1 changed files with 20 additions and 17 deletions

37
sys/kern/kern_condvar.c

@ -118,10 +118,8 @@ cv_switch(struct thread *td)
td->td_proc->p_stat = SSLEEP; td->td_proc->p_stat = SSLEEP;
td->td_proc->p_stats->p_ru.ru_nvcsw++; td->td_proc->p_stats->p_ru.ru_nvcsw++;
mi_switch(); mi_switch();
CTR3(KTR_PROC, "cv_switch: resume thread %p (pid %d, %s)", CTR3(KTR_PROC, "cv_switch: resume thread %p (pid %d, %s)", td,
td, td->td_proc->p_pid, td->td_proc->p_comm);
td->td_proc->p_pid,
td->td_proc->p_comm);
} }
/* /*
@ -130,6 +128,7 @@ cv_switch(struct thread *td)
static __inline int static __inline int
cv_switch_catch(struct thread *td) cv_switch_catch(struct thread *td)
{ {
struct proc *p;
int sig; int sig;
/* /*
@ -142,10 +141,11 @@ cv_switch_catch(struct thread *td)
*/ */
td->td_flags |= TDF_SINTR; td->td_flags |= TDF_SINTR;
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
PROC_LOCK(td->td_proc); p = td->td_proc;
sig = CURSIG(td->td_proc); /* XXXKSE */ PROC_LOCK(p);
sig = CURSIG(p); /* XXXKSE */
mtx_lock_spin(&sched_lock); mtx_lock_spin(&sched_lock);
PROC_UNLOCK_NOSWITCH(td->td_proc); PROC_UNLOCK_NOSWITCH(p);
if (sig != 0) { if (sig != 0) {
if (td->td_wchan != NULL) if (td->td_wchan != NULL)
cv_waitq_remove(td); cv_waitq_remove(td);
@ -179,8 +179,7 @@ cv_waitq_add(struct cv *cvp, struct thread *td)
td->td_ksegrp->kg_slptime = 0; /* XXXKSE */ td->td_ksegrp->kg_slptime = 0; /* XXXKSE */
td->td_ksegrp->kg_pri.pri_native = td->td_ksegrp->kg_pri.pri_level; td->td_ksegrp->kg_pri.pri_native = td->td_ksegrp->kg_pri.pri_level;
CTR3(KTR_PROC, "cv_waitq_add: thread %p (pid %d, %s)", td, CTR3(KTR_PROC, "cv_waitq_add: thread %p (pid %d, %s)", td,
td->td_proc->p_pid, td->td_proc->p_pid, td->td_proc->p_comm);
td->td_proc->p_comm);
TAILQ_INSERT_TAIL(&cvp->cv_waitq, td, td_slpq); TAILQ_INSERT_TAIL(&cvp->cv_waitq, td, td_slpq);
} }
@ -245,11 +244,13 @@ int
cv_wait_sig(struct cv *cvp, struct mtx *mp) cv_wait_sig(struct cv *cvp, struct mtx *mp)
{ {
struct thread *td; struct thread *td;
struct proc *p
int rval; int rval;
int sig; int sig;
WITNESS_SAVE_DECL(mp); WITNESS_SAVE_DECL(mp);
td = curthread; td = curthread;
p = td->td_proc;
rval = 0; rval = 0;
#ifdef KTRACE #ifdef KTRACE
if (td->td_proc && KTRPOINT(td->td_proc, KTR_CSW)) if (td->td_proc && KTRPOINT(td->td_proc, KTR_CSW))
@ -281,16 +282,16 @@ cv_wait_sig(struct cv *cvp, struct mtx *mp)
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
PICKUP_GIANT(); PICKUP_GIANT();
PROC_LOCK(td->td_proc); PROC_LOCK(p);
if (sig == 0) if (sig == 0)
sig = CURSIG(td->td_proc); /* XXXKSE */ sig = CURSIG(p); /* XXXKSE */
if (sig != 0) { if (sig != 0) {
if (SIGISMEMBER(td->td_proc->p_sigacts->ps_sigintr, sig)) if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig))
rval = EINTR; rval = EINTR;
else else
rval = ERESTART; rval = ERESTART;
} }
PROC_UNLOCK(td->td_proc); PROC_UNLOCK(p);
#ifdef KTRACE #ifdef KTRACE
mtx_lock(&Giant); mtx_lock(&Giant);
@ -382,11 +383,13 @@ int
cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo) cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo)
{ {
struct thread *td; struct thread *td;
struct proc *p;
int rval; int rval;
int sig; int sig;
WITNESS_SAVE_DECL(mp); WITNESS_SAVE_DECL(mp);
td = curthread; td = curthread;
p = td->td_proc;
rval = 0; rval = 0;
#ifdef KTRACE #ifdef KTRACE
if (td->td_proc && KTRPOINT(td->td_proc, KTR_CSW)) if (td->td_proc && KTRPOINT(td->td_proc, KTR_CSW))
@ -434,16 +437,16 @@ cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo)
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
PICKUP_GIANT(); PICKUP_GIANT();
PROC_LOCK(td->td_proc); PROC_LOCK(p);
if (sig == 0) if (sig == 0)
sig = CURSIG(td->td_proc); sig = CURSIG(p);
if (sig != 0) { if (sig != 0) {
if (SIGISMEMBER(td->td_proc->p_sigacts->ps_sigintr, sig)) if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig))
rval = EINTR; rval = EINTR;
else else
rval = ERESTART; rval = ERESTART;
} }
PROC_UNLOCK(td->td_proc); PROC_UNLOCK(p);
#ifdef KTRACE #ifdef KTRACE
mtx_lock(&Giant); mtx_lock(&Giant);