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

Nice, is a property of a process as a whole..

Browse Source 
I mistakenly moved it to the ksegroup when breaking up the process
structure. Put it back in the proc structure.
This commit is contained in:
Julian Elischer 2004-06-16 00:26:31 +00:00
parent 7421be0528
commit fa88511615
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=130551
13 changed files with 63 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/fs/specfs/spec_vnops.c
View File

@ -470,11 +470,11 @@ spec_xstrategy(struct vnode *vp, struct buf *bp)
/* /*
* Slow down disk requests for niced processes. * Slow down disk requests for niced processes.
*/ */
if (doslowdown && td && td->td_ksegrp->kg_nice > 0) { if (doslowdown && td && td->td_proc->p_nice > 0) {
mtx_lock(&strategy_mtx); mtx_lock(&strategy_mtx);
msleep(&strategy_mtx, &strategy_mtx, msleep(&strategy_mtx, &strategy_mtx,
PPAUSE | PCATCH | PDROP, "ioslow", PPAUSE | PCATCH | PDROP, "ioslow",
td->td_ksegrp->kg_nice); td->td_proc->p_nice);
} }
/* /*
* Collect statistics on synchronous and asynchronous read * Collect statistics on synchronous and asynchronous read

4
sys/i386/ibcs2/ibcs2_misc.c
View File

@ -951,10 +951,10 @@ ibcs2_nice(td, uap)
sa.which = PRIO_PROCESS; sa.which = PRIO_PROCESS;
sa.who = 0; sa.who = 0;
sa.prio = td->td_ksegrp->kg_nice + uap->incr; sa.prio = td->td_proc->p_nice + uap->incr;
if ((error = setpriority(td, &sa)) != 0) if ((error = setpriority(td, &sa)) != 0)
return EPERM; return EPERM;
td->td_retval[0] = td->td_ksegrp->kg_nice; td->td_retval[0] = td->td_proc->p_nice;
return 0; return 0;
} }

2
sys/kern/init_main.c
View File

@ -382,8 +382,8 @@ proc0_init(void *dummy __unused)
p->p_flag = P_SYSTEM; p->p_flag = P_SYSTEM;
p->p_sflag = PS_INMEM; p->p_sflag = PS_INMEM;
p->p_state = PRS_NORMAL; p->p_state = PRS_NORMAL;
p->p_nice = NZERO;
td->td_state = TDS_RUNNING; td->td_state = TDS_RUNNING;
kg->kg_nice = NZERO;
kg->kg_pri_class = PRI_TIMESHARE; kg->kg_pri_class = PRI_TIMESHARE;
kg->kg_user_pri = PUSER; kg->kg_user_pri = PUSER;
td->td_priority = PVM; td->td_priority = PVM;

2
sys/kern/kern_clock.c
View File

@ -392,7 +392,7 @@ statclock(frame)
if (p->p_flag & P_SA) if (p->p_flag & P_SA)
thread_statclock(1); thread_statclock(1);
p->p_uticks++; p->p_uticks++;
if (td->td_ksegrp->kg_nice > NZERO) if (p->p_nice > NZERO)
cp_time[CP_NICE]++; cp_time[CP_NICE]++;
else else
cp_time[CP_USER]++; cp_time[CP_USER]++;

2
sys/kern/kern_proc.c
View File

@ -740,6 +740,7 @@ fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp)
kp->ki_sflag = p->p_sflag; kp->ki_sflag = p->p_sflag;
kp->ki_swtime = p->p_swtime; kp->ki_swtime = p->p_swtime;
kp->ki_pid = p->p_pid; kp->ki_pid = p->p_pid;
kp->ki_nice = p->p_nice;
kg = td->td_ksegrp; kg = td->td_ksegrp;
ke = td->td_kse; ke = td->td_kse;
bintime2timeval(&p->p_runtime, &tv); bintime2timeval(&p->p_runtime, &tv);
@ -751,7 +752,6 @@ fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp)
kp->ki_slptime = kg->kg_slptime; kp->ki_slptime = kg->kg_slptime;
kp->ki_pri.pri_user = kg->kg_user_pri; kp->ki_pri.pri_user = kg->kg_user_pri;
kp->ki_pri.pri_class = kg->kg_pri_class; kp->ki_pri.pri_class = kg->kg_pri_class;
kp->ki_nice = kg->kg_nice;
/* Things in the thread */ /* Things in the thread */
kp->ki_wchan = td->td_wchan; kp->ki_wchan = td->td_wchan;

44
sys/kern/kern_resource.c
View File

@ -88,7 +88,6 @@ getpriority(td, uap)
struct thread *td; struct thread *td;
register struct getpriority_args *uap; register struct getpriority_args *uap;
{ {
struct ksegrp *kg;
struct proc *p; struct proc *p;
int error, low; int error, low;
@ -98,16 +97,13 @@ getpriority(td, uap)
case PRIO_PROCESS: case PRIO_PROCESS:
if (uap->who == 0) if (uap->who == 0)
low = td->td_ksegrp->kg_nice; low = td->td_proc->p_nice;
else { else {
p = pfind(uap->who); p = pfind(uap->who);
if (p == NULL) if (p == NULL)
break; break;
if (p_cansee(td, p) == 0) { if (p_cansee(td, p) == 0) {
FOREACH_KSEGRP_IN_PROC(p, kg) { low = p->p_nice;
if (kg->kg_nice < low)
low = kg->kg_nice;
}
} }
PROC_UNLOCK(p); PROC_UNLOCK(p);
} }
@ -131,10 +127,8 @@ getpriority(td, uap)
LIST_FOREACH(p, &pg->pg_members, p_pglist) { LIST_FOREACH(p, &pg->pg_members, p_pglist) {
PROC_LOCK(p); PROC_LOCK(p);
if (!p_cansee(td, p)) { if (!p_cansee(td, p)) {
FOREACH_KSEGRP_IN_PROC(p, kg) { if (p->p_nice < low)
if (kg->kg_nice < low) low = p->p_nice;
low = kg->kg_nice;
}
} }
PROC_UNLOCK(p); PROC_UNLOCK(p);
} }
@ -150,10 +144,8 @@ getpriority(td, uap)
PROC_LOCK(p); PROC_LOCK(p);
if (!p_cansee(td, p) && if (!p_cansee(td, p) &&
p->p_ucred->cr_uid == uap->who) { p->p_ucred->cr_uid == uap->who) {
FOREACH_KSEGRP_IN_PROC(p, kg) { if (p->p_nice < low)
if (kg->kg_nice < low) low = p->p_nice;
low = kg->kg_nice;
}
} }
PROC_UNLOCK(p); PROC_UNLOCK(p);
} }
@ -260,19 +252,13 @@ setpriority(td, uap)
} }
/* /*
* Set "nice" for a process. Doesn't really understand threaded processes * Set "nice" for a (whole) process.
* well but does try. Has the unfortunate side effect of making all the NICE
* values for a process's ksegrps the same. This suggests that
* NICE values should be stored as a process nice and deltas for the ksegrps.
* (but not yet).
*/ */
static int static int
donice(struct thread *td, struct proc *p, int n) donice(struct thread *td, struct proc *p, int n)
{ {
struct ksegrp *kg; int error;
int error, low;
low = PRIO_MAX + 1;
PROC_LOCK_ASSERT(p, MA_OWNED); PROC_LOCK_ASSERT(p, MA_OWNED);
if ((error = p_cansched(td, p))) if ((error = p_cansched(td, p)))
return (error); return (error);
@ -280,20 +266,10 @@ donice(struct thread *td, struct proc *p, int n)
n = PRIO_MAX; n = PRIO_MAX;
if (n < PRIO_MIN) if (n < PRIO_MIN)
n = PRIO_MIN; n = PRIO_MIN;
/* if (n < p->p_nice && suser(td) != 0)
* Only allow nicing if to more than the lowest nice.
* E.g., for nices of 4,3,2 allow nice to 3 but not 1
*/
FOREACH_KSEGRP_IN_PROC(p, kg) {
if (kg->kg_nice < low)
low = kg->kg_nice;
}
if (n < low && suser(td) != 0)
return (EACCES); return (EACCES);
mtx_lock_spin(&sched_lock); mtx_lock_spin(&sched_lock);
FOREACH_KSEGRP_IN_PROC(p, kg) { sched_nice(p, n);
sched_nice(kg, n);
}
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
return (0); return (0);
} }

13
sys/kern/sched_4bsd.c
View File

@ -439,7 +439,7 @@ resetpriority(struct ksegrp *kg)
if (kg->kg_pri_class == PRI_TIMESHARE) { if (kg->kg_pri_class == PRI_TIMESHARE) {
newpriority = PUSER + kg->kg_estcpu / INVERSE_ESTCPU_WEIGHT + newpriority = PUSER + kg->kg_estcpu / INVERSE_ESTCPU_WEIGHT +
NICE_WEIGHT * (kg->kg_nice - PRIO_MIN); NICE_WEIGHT * (kg->kg_proc->p_nice - PRIO_MIN);
newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), newpriority = min(max(newpriority, PRI_MIN_TIMESHARE),
PRI_MAX_TIMESHARE); PRI_MAX_TIMESHARE);
kg->kg_user_pri = newpriority; kg->kg_user_pri = newpriority;
@ -583,13 +583,16 @@ sched_fork_thread(struct thread *td, struct thread *child)
} }
void void
sched_nice(struct ksegrp *kg, int nice) sched_nice(struct proc *p, int nice)
{ {
struct ksegrp *kg;
PROC_LOCK_ASSERT(kg->kg_proc, MA_OWNED); PROC_LOCK_ASSERT(p, MA_OWNED);
mtx_assert(&sched_lock, MA_OWNED); mtx_assert(&sched_lock, MA_OWNED);
kg->kg_nice = nice; p->p_nice = nice;
resetpriority(kg); FOREACH_KSEGRP_IN_PROC(p, kg) {
resetpriority(kg);
}
} }
void void

54
sys/kern/sched_ule.c
View File

@ -366,9 +366,9 @@ kseq_load_add(struct kseq *kseq, struct kse *ke)
CTR6(KTR_ULE, CTR6(KTR_ULE,
"Add kse %p to %p (slice: %d, pri: %d, nice: %d(%d))", "Add kse %p to %p (slice: %d, pri: %d, nice: %d(%d))",
ke, ke->ke_runq, ke->ke_slice, ke->ke_thread->td_priority, ke, ke->ke_runq, ke->ke_slice, ke->ke_thread->td_priority,
ke->ke_ksegrp->kg_nice, kseq->ksq_nicemin); ke->ke_proc->p_nice, kseq->ksq_nicemin);
if (ke->ke_ksegrp->kg_pri_class == PRI_TIMESHARE) if (ke->ke_ksegrp->kg_pri_class == PRI_TIMESHARE)
kseq_nice_add(kseq, ke->ke_ksegrp->kg_nice); kseq_nice_add(kseq, ke->ke_proc->p_nice);
} }
static void static void
@ -388,7 +388,7 @@ kseq_load_rem(struct kseq *kseq, struct kse *ke)
kseq->ksq_load--; kseq->ksq_load--;
ke->ke_runq = NULL; ke->ke_runq = NULL;
if (ke->ke_ksegrp->kg_pri_class == PRI_TIMESHARE) if (ke->ke_ksegrp->kg_pri_class == PRI_TIMESHARE)
kseq_nice_rem(kseq, ke->ke_ksegrp->kg_nice); kseq_nice_rem(kseq, ke->ke_proc->p_nice);
} }
static void static void
@ -929,7 +929,7 @@ sched_priority(struct ksegrp *kg)
pri = SCHED_PRI_INTERACT(sched_interact_score(kg)); pri = SCHED_PRI_INTERACT(sched_interact_score(kg));
pri += SCHED_PRI_BASE; pri += SCHED_PRI_BASE;
pri += kg->kg_nice; pri += kg->kg_proc->p_nice;
if (pri > PRI_MAX_TIMESHARE) if (pri > PRI_MAX_TIMESHARE)
pri = PRI_MAX_TIMESHARE; pri = PRI_MAX_TIMESHARE;
@ -980,13 +980,13 @@ sched_slice(struct kse *ke)
if (!SCHED_INTERACTIVE(kg)) { if (!SCHED_INTERACTIVE(kg)) {
int nice; int nice;
nice = kg->kg_nice + (0 - kseq->ksq_nicemin); nice = kg->kg_proc->p_nice + (0 - kseq->ksq_nicemin);
if (kseq->ksq_load_timeshare == 0 || if (kseq->ksq_load_timeshare == 0 ||
kg->kg_nice < kseq->ksq_nicemin) kg->kg_proc->p_nice < kseq->ksq_nicemin)
ke->ke_slice = SCHED_SLICE_MAX; ke->ke_slice = SCHED_SLICE_MAX;
else if (nice <= SCHED_SLICE_NTHRESH) else if (nice <= SCHED_SLICE_NTHRESH)
ke->ke_slice = SCHED_SLICE_NICE(nice); ke->ke_slice = SCHED_SLICE_NICE(nice);
else if (kg->kg_nice == 0) else if (kg->kg_proc->p_nice == 0)
ke->ke_slice = SCHED_SLICE_MIN; ke->ke_slice = SCHED_SLICE_MIN;
else else
ke->ke_slice = 0; ke->ke_slice = 0;
@ -995,7 +995,7 @@ sched_slice(struct kse *ke)
CTR6(KTR_ULE, CTR6(KTR_ULE,
"Sliced %p(%d) (nice: %d, nicemin: %d, load: %d, interactive: %d)", "Sliced %p(%d) (nice: %d, nicemin: %d, load: %d, interactive: %d)",
ke, ke->ke_slice, kg->kg_nice, kseq->ksq_nicemin, ke, ke->ke_slice, kg->kg_proc->p_nice, kseq->ksq_nicemin,
kseq->ksq_load_timeshare, SCHED_INTERACTIVE(kg)); kseq->ksq_load_timeshare, SCHED_INTERACTIVE(kg));
return; return;
@ -1167,29 +1167,35 @@ sched_switch(struct thread *td)
} }
void void
sched_nice(struct ksegrp *kg, int nice) sched_nice(struct proc *p, int nice)
{ {
struct ksegrp *kg;
struct kse *ke; struct kse *ke;
struct thread *td; struct thread *td;
struct kseq *kseq; struct kseq *kseq;
PROC_LOCK_ASSERT(kg->kg_proc, MA_OWNED); PROC_LOCK_ASSERT(p, MA_OWNED);
mtx_assert(&sched_lock, MA_OWNED); mtx_assert(&sched_lock, MA_OWNED);
/* /*
* We need to adjust the nice counts for running KSEs. * We need to adjust the nice counts for running KSEs.
*/ */
if (kg->kg_pri_class == PRI_TIMESHARE) FOREACH_KSEGRP_IN_PROC(p, kg) {
FOREACH_KSE_IN_GROUP(kg, ke) { if (kg->kg_pri_class == PRI_TIMESHARE) {
if (ke->ke_runq == NULL) FOREACH_KSE_IN_GROUP(kg, ke) {
continue; if (ke->ke_runq == NULL)
kseq = KSEQ_CPU(ke->ke_cpu); continue;
kseq_nice_rem(kseq, kg->kg_nice); kseq = KSEQ_CPU(ke->ke_cpu);
kseq_nice_add(kseq, nice); kseq_nice_rem(kseq, p->p_nice);
kseq_nice_add(kseq, nice);
}
} }
kg->kg_nice = nice; }
sched_priority(kg); p->p_nice = nice;
FOREACH_THREAD_IN_GROUP(kg, td) FOREACH_KSEGRP_IN_PROC(p, kg) {
td->td_flags |= TDF_NEEDRESCHED; sched_priority(kg);
FOREACH_THREAD_IN_GROUP(kg, td)
td->td_flags |= TDF_NEEDRESCHED;
}
} }
void void
@ -1246,6 +1252,7 @@ sched_fork(struct proc *p, struct proc *p1)
mtx_assert(&sched_lock, MA_OWNED); mtx_assert(&sched_lock, MA_OWNED);
p1->p_nice = p->p_nice;
sched_fork_ksegrp(FIRST_KSEGRP_IN_PROC(p), FIRST_KSEGRP_IN_PROC(p1)); sched_fork_ksegrp(FIRST_KSEGRP_IN_PROC(p), FIRST_KSEGRP_IN_PROC(p1));
sched_fork_kse(FIRST_KSE_IN_PROC(p), FIRST_KSE_IN_PROC(p1)); sched_fork_kse(FIRST_KSE_IN_PROC(p), FIRST_KSE_IN_PROC(p1));
sched_fork_thread(FIRST_THREAD_IN_PROC(p), FIRST_THREAD_IN_PROC(p1)); sched_fork_thread(FIRST_THREAD_IN_PROC(p), FIRST_THREAD_IN_PROC(p1));
@ -1273,7 +1280,6 @@ sched_fork_ksegrp(struct ksegrp *kg, struct ksegrp *child)
child->kg_slptime = kg->kg_slptime; child->kg_slptime = kg->kg_slptime;
child->kg_runtime = kg->kg_runtime; child->kg_runtime = kg->kg_runtime;
child->kg_user_pri = kg->kg_user_pri; child->kg_user_pri = kg->kg_user_pri;
child->kg_nice = kg->kg_nice;
sched_interact_fork(child); sched_interact_fork(child);
kg->kg_runtime += tickincr << 10; kg->kg_runtime += tickincr << 10;
sched_interact_update(kg); sched_interact_update(kg);
@ -1327,11 +1333,11 @@ sched_class(struct ksegrp *kg, int class)
#endif #endif
if (oclass == PRI_TIMESHARE) { if (oclass == PRI_TIMESHARE) {
kseq->ksq_load_timeshare--; kseq->ksq_load_timeshare--;
kseq_nice_rem(kseq, kg->kg_nice); kseq_nice_rem(kseq, kg->kg_proc->p_nice);
} }
if (nclass == PRI_TIMESHARE) { if (nclass == PRI_TIMESHARE) {
kseq->ksq_load_timeshare++; kseq->ksq_load_timeshare++;
kseq_nice_add(kseq, kg->kg_nice); kseq_nice_add(kseq, kg->kg_proc->p_nice);
} }
} }

2
sys/sys/proc.h
View File

@ -509,7 +509,6 @@ struct ksegrp {
#define kg_startcopy kg_endzero #define kg_startcopy kg_endzero
u_char kg_pri_class; /* (j) Scheduling class. */ u_char kg_pri_class; /* (j) Scheduling class. */
u_char kg_user_pri; /* (j) User pri from estcpu and nice. */ u_char kg_user_pri; /* (j) User pri from estcpu and nice. */
signed char kg_nice; /* (c + j) Process "nice" value. */
#define kg_endcopy kg_numthreads #define kg_endcopy kg_numthreads
int kg_numthreads; /* (j) Num threads in total. */ int kg_numthreads; /* (j) Num threads in total. */
int kg_kses; /* (j) Num KSEs in group. */ int kg_kses; /* (j) Num KSEs in group. */
@ -597,6 +596,7 @@ struct proc {
struct sysentvec *p_sysent; /* (b) Syscall dispatch info. */ struct sysentvec *p_sysent; /* (b) Syscall dispatch info. */
struct pargs *p_args; /* (c) Process arguments. */ struct pargs *p_args; /* (c) Process arguments. */
rlim_t p_cpulimit; /* (j) Current CPU limit in seconds. */ rlim_t p_cpulimit; /* (j) Current CPU limit in seconds. */
signed char p_nice; /* (c + j) Process "nice" value. */
/* End area that is copied on creation. */ /* End area that is copied on creation. */
#define p_endcopy p_xstat #define p_endcopy p_xstat

2
sys/sys/sched.h
View File

@ -55,7 +55,7 @@ void sched_fork(struct proc *p, struct proc *child);
void sched_class(struct ksegrp *kg, int class); void sched_class(struct ksegrp *kg, int class);
void sched_exit_ksegrp(struct ksegrp *kg, struct ksegrp *child); void sched_exit_ksegrp(struct ksegrp *kg, struct ksegrp *child);
void sched_fork_ksegrp(struct ksegrp *kg, struct ksegrp *child); void sched_fork_ksegrp(struct ksegrp *kg, struct ksegrp *child);
void sched_nice(struct ksegrp *kg, int nice); void sched_nice(struct proc *p, int nice);
/* /*
* Threads are switched in and out, block on resources, have temporary * Threads are switched in and out, block on resources, have temporary

8
sys/ufs/ffs/ffs_snapshot.c
View File

@ -301,11 +301,11 @@ ffs_snapshot(mp, snapfile)
* *
* Recind nice scheduling while running with the filesystem suspended. * Recind nice scheduling while running with the filesystem suspended.
*/ */
if (td->td_ksegrp->kg_nice > 0) { if (td->td_proc->p_nice > 0) {
PROC_LOCK(td->td_proc); PROC_LOCK(td->td_proc);
mtx_lock_spin(&sched_lock); mtx_lock_spin(&sched_lock);
saved_nice = td->td_ksegrp->kg_nice; saved_nice = td->td_proc->p_nice;
sched_nice(td->td_ksegrp, 0); sched_nice(td->td_proc, 0);
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(td->td_proc); PROC_UNLOCK(td->td_proc);
} }
@ -665,7 +665,7 @@ ffs_snapshot(mp, snapfile)
if (saved_nice > 0) { if (saved_nice > 0) {
PROC_LOCK(td->td_proc); PROC_LOCK(td->td_proc);
mtx_lock_spin(&sched_lock); mtx_lock_spin(&sched_lock);
sched_nice(td->td_ksegrp, saved_nice); sched_nice(td->td_proc, saved_nice);
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(td->td_proc); PROC_UNLOCK(td->td_proc);
} }

2
sys/vm/vm_glue.c
View File

@ -824,7 +824,7 @@ scheduler(dummy)
kg = td->td_ksegrp; kg = td->td_ksegrp;
pri = p->p_swtime + kg->kg_slptime; pri = p->p_swtime + kg->kg_slptime;
if ((p->p_sflag & PS_SWAPINREQ) == 0) { if ((p->p_sflag & PS_SWAPINREQ) == 0) {
pri -= kg->kg_nice * 8; pri -= p->p_nice * 8;
} }
/* /*

5
sys/vm/vm_pageout.c
View File

@ -1225,12 +1225,9 @@ vm_pageout_scan(int pass)
} }
sx_sunlock(&allproc_lock); sx_sunlock(&allproc_lock);
if (bigproc != NULL) { if (bigproc != NULL) {
struct ksegrp *kg;
killproc(bigproc, "out of swap space"); killproc(bigproc, "out of swap space");
mtx_lock_spin(&sched_lock); mtx_lock_spin(&sched_lock);
FOREACH_KSEGRP_IN_PROC(bigproc, kg) { sched_nice(bigproc, PRIO_MIN);
sched_nice(kg, PRIO_MIN); /* XXXKSE ??? */
}
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(bigproc); PROC_UNLOCK(bigproc);
wakeup(&cnt.v_free_count); wakeup(&cnt.v_free_count);