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

Tidy up hardclock.

Browse Source 
- use fcmpset for updating ticks
- move (rarely used) itimer handling to a dedicated function

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mateusz Guzik 2018-11-29 03:44:02 +00:00
parent f4a80449ce
commit 3277792bde
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
sys/kern/kern_clock.c
View File

@ -421,36 +421,14 @@ initclocks(void *dummy)
#endif #endif
} }
void static __noinline void
hardclock(int cnt, int usermode) hardclock_itimer(struct thread *td, struct pstats *pstats, int cnt, int usermode)
{ {
struct pstats *pstats; struct proc *p;
struct thread *td = curthread; int flags;
struct proc *p = td->td_proc;
int *t = DPCPU_PTR(pcputicks);
int flags, global, newticks;
int i;
/*
* Update per-CPU and possibly global ticks values.
*/
*t += cnt;
do {
global = ticks;
newticks = *t - global;
if (newticks <= 0) {
if (newticks < -1)
*t = global - 1;
newticks = 0;
break;
}
} while (!atomic_cmpset_int(&ticks, global, *t));
/*
* Run current process's virtual and profile time, as needed.
*/
pstats = p->p_stats;
flags = 0; flags = 0;
p = td->td_proc;
if (usermode && if (usermode &&
timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value)) { timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value)) {
PROC_ITIMLOCK(p); PROC_ITIMLOCK(p);
@ -471,6 +449,40 @@ hardclock(int cnt, int usermode)
td->td_flags |= flags; td->td_flags |= flags;
thread_unlock(td); thread_unlock(td);
} }
}
void
hardclock(int cnt, int usermode)
{
struct pstats *pstats;
struct thread *td = curthread;
struct proc *p = td->td_proc;
int *t = DPCPU_PTR(pcputicks);
int global, i, newticks;
/*
* Update per-CPU and possibly global ticks values.
*/
*t += cnt;
global = ticks;
do {
newticks = *t - global;
if (newticks <= 0) {
if (newticks < -1)
*t = global - 1;
newticks = 0;
break;
}
} while (!atomic_fcmpset_int(&ticks, &global, *t));
/*
* Run current process's virtual and profile time, as needed.
*/
pstats = p->p_stats;
if (__predict_false(
timevalisset(&pstats->p_timer[ITIMER_VIRTUAL].it_value) ||
timevalisset(&pstats->p_timer[ITIMER_PROF].it_value)))
hardclock_itimer(td, pstats, cnt, usermode);
#ifdef HWPMC_HOOKS #ifdef HWPMC_HOOKS
if (PMC_CPU_HAS_SAMPLES(PCPU_GET(cpuid))) if (PMC_CPU_HAS_SAMPLES(PCPU_GET(cpuid)))