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

Assert that the thread lock is held in sched_pctcpu() instead of

Browse Source 
recursively acquiring it.  All of the current callers already hold the
lock.

MFC after:	1 month
This commit is contained in:
John Baldwin 2010-06-03 16:02:11 +00:00
parent a3a11ad455
commit 3da35a0a52
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/kern/sched_4bsd.c
View File

@ -1523,6 +1523,7 @@ sched_pctcpu(struct thread *td)
{ {
struct td_sched *ts; struct td_sched *ts;
THREAD_LOCK_ASSERT(td, MA_OWNED);
ts = td->td_sched; ts = td->td_sched;
return (ts->ts_pctcpu); return (ts->ts_pctcpu);
} }

3
sys/kern/sched_ule.c
View File

@ -2367,7 +2367,7 @@ sched_pctcpu(struct thread *td)
if (ts == NULL) if (ts == NULL)
return (0); return (0);
thread_lock(td); THREAD_LOCK_ASSERT(td, MA_OWNED);
if (ts->ts_ticks) { if (ts->ts_ticks) {
int rtick; int rtick;
@ -2376,7 +2376,6 @@ sched_pctcpu(struct thread *td)
rtick = min(SCHED_TICK_HZ(ts) / SCHED_TICK_SECS, hz); rtick = min(SCHED_TICK_HZ(ts) / SCHED_TICK_SECS, hz);
pctcpu = (FSCALE * ((FSCALE * rtick)/hz)) >> FSHIFT; pctcpu = (FSCALE * ((FSCALE * rtick)/hz)) >> FSHIFT;
} }
thread_unlock(td);
return (pctcpu); return (pctcpu);
} }