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

- Unbreak world. I did not notice that libkvm was still used in some places

Browse Source 
to access the pctcpu.  This will have to be sorted out more later as the
   new scheduler requires a procedural interface for this data.  A more
   complete solution will follow.
This commit is contained in:
Jeff Roberson 2003-01-13 03:42:41 +00:00
parent e9a0b8260e
commit 8fb913face
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/sched_4bsd.c
View File

@ -63,7 +63,6 @@
struct ke_sched {
int ske_cpticks; /* (j) Ticks of cpu time. */
fixpt_t ske_pctcpu; /* (j) %cpu during p_swtime. */
};
struct ke_sched ke_sched;
@ -285,8 +284,8 @@ schedcpu(void *arg)
* Do it per kse.. and add them up at the end?
* XXXKSE
*/
ke->ke_sched->ske_pctcpu
= (ke->ke_sched->ske_pctcpu * ccpu) >>
ke->ke_pctcpu
= (ke->ke_pctcpu * ccpu) >>
FSHIFT;
/*
* If the kse has been idle the entire second,
@ -296,13 +295,13 @@ schedcpu(void *arg)
if (ke->ke_sched->ske_cpticks == 0)
continue;
#if (FSHIFT >= CCPU_SHIFT)
ke->ke_sched->ske_pctcpu += (realstathz == 100)
ke->ke_pctcpu += (realstathz == 100)
? ((fixpt_t) ke->ke_sched->ske_cpticks) <<
(FSHIFT - CCPU_SHIFT) :
100 * (((fixpt_t) ke->ke_sched->ske_cpticks)
<< (FSHIFT - CCPU_SHIFT)) / realstathz;
#else
ke->ke_sched->ske_pctcpu += ((FSCALE - ccpu) *
ke->ke_pctcpu += ((FSCALE - ccpu) *
(ke->ke_sched->ske_cpticks *
FSCALE / realstathz)) >> FSHIFT;
#endif
@ -482,7 +481,6 @@ sched_fork(struct ksegrp *kg, struct ksegrp *child)
/* Set up scheduler specific data */
ke = FIRST_KSE_IN_KSEGRP(kg);
ke->ke_sched->ske_pctcpu = 0;
ke->ke_sched->ske_cpticks = 0;
}
@ -667,5 +665,5 @@ sched_sizeof_thread(void)
fixpt_t
sched_pctcpu(struct kse *ke)
{
return (ke->ke_sched->ske_pctcpu);
return (ke->ke_pctcpu);
}

1
sys/sys/proc.h
View File

@ -441,6 +441,7 @@ struct kse {
int ke_flags; /* (j) KEF_* flags. */
struct thread *ke_thread; /* Active associated thread. */
struct thread *ke_owner; /* Always points to the owner */
fixpt_t ke_pctcpu; /* (j) %cpu during p_swtime. */
u_int64_t ke_uu; /* (j) Previous user time in usec. */
u_int64_t ke_su; /* (j) Previous system time in usec. */
u_int64_t ke_iu; /* (j) Previous intr time in usec. */