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

- Change all callers of addupc_task() to check PS_PROFIL explicitly and

Browse Source 
remove the check from addupc_task().  It would need sched_lock while
  testing the flag anyways.
- Always read sticks while holding sched_lock using a temporary variable
  where needed.
- Always init prticks to 0 in ast() to quiet a warning.
This commit is contained in:
John Baldwin 2001-12-18 09:06:10 +00:00
parent 3f9a462fb9
commit 48fd1f38ee
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=88119
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/kern/subr_prof.c
View File

@ -513,8 +513,7 @@ addupc_task(ke, pc, ticks)
register u_int i;
u_short v;
/* Testing PS_PROFIL may be unnecessary, but is certainly safe. */
if ((p->p_sflag & PS_PROFIL) == 0 || ticks == 0)
if (ticks == 0)
return;
prof = &p->p_stats->p_prof;

19
sys/kern/subr_trap.c
View File

@ -102,16 +102,20 @@ userret(td, frame, oticks)
postsig(sig);
mtx_unlock(&Giant);
PROC_UNLOCK(p);
} else
mtx_unlock_spin(&sched_lock);
mtx_lock_spin(&sched_lock);
}
/*
* Charge system time if profiling.
*/
if (p->p_sflag & PS_PROFIL) {
addupc_task(ke, TRAPF_PC(frame),
(u_int)(ke->ke_sticks - oticks) * psratio);
}
quad_t ticks;
ticks = ke->ke_sticks - oticks;
mtx_unlock_spin(&sched_lock);
addupc_task(ke, TRAPF_PC(frame), (u_int)ticks * psratio);
} else
mtx_unlock_spin(&sched_lock);
}
/*
@ -141,6 +145,7 @@ ast(framep)
panic("Returning to user mode with mutex(s) held");
#endif
mtx_assert(&Giant, MA_NOTOWNED);
prticks = 0; /* XXX: Quiet warning. */
s = cpu_critical_enter();
while ((ke->ke_flags & (KEF_ASTPENDING | KEF_NEEDRESCHED)) != 0) {
cpu_critical_exit(s);
@ -159,7 +164,7 @@ ast(framep)
p->p_sflag &= ~(PS_PROFPEND | PS_ALRMPEND);
ke->ke_flags &= ~(KEF_OWEUPC | KEF_ASTPENDING);
cnt.v_soft++;
if (flags & KEF_OWEUPC) {
if (flags & KEF_OWEUPC && sflag & PS_PROFIL) {
prticks = p->p_stats->p_prof.pr_ticks;
p->p_stats->p_prof.pr_ticks = 0;
}
@ -167,7 +172,7 @@ ast(framep)
PROC_LOCK(p);
td->td_ucred = crhold(p->p_ucred);
PROC_UNLOCK(p);
if (flags & KEF_OWEUPC)
if (flags & KEF_OWEUPC && sflag & PS_PROFIL)
addupc_task(ke, p->p_stats->p_prof.pr_addr, prticks);
if (sflag & PS_ALRMPEND) {
PROC_LOCK(p);