emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: add major/minor page fault deltas

Browse Source 
Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2012-07-08 04:02:58 -05:00 committed by Craig Small
parent 7753bd1004
commit d9cf59a9b2
3 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
top/top.c
View File

@ -212,6 +212,8 @@ SCB_STRS(ENV, environ[0])
SCB_NUM1(FLG, flags) SCB_NUM1(FLG, flags)
SCB_NUM1(FL1, maj_flt) SCB_NUM1(FL1, maj_flt)
SCB_NUM1(FL2, min_flt) SCB_NUM1(FL2, min_flt)
SCB_NUM1(FV1, maj_delta)
SCB_NUM1(FV2, min_delta)
SCB_NUMx(GID, egid) SCB_NUMx(GID, egid)
SCB_STRS(GRP, egroup) SCB_STRS(GRP, egroup)
SCB_NUMx(NCE, nice) SCB_NUMx(NCE, nice)
@ -1300,7 +1302,9 @@ static FLD_t Fieldstab[] = {
{ " Badness ", "%8d ", -1, -1, SF(OOM), L_oom, NULL }, { " Badness ", "%8d ", -1, -1, SF(OOM), L_oom, NULL },
#undef L_oom #undef L_oom
#endif #endif
{ "ENVIRON ", NULL, -1, -1, SF(ENV), L_ENVIRON, NULL } { "ENVIRON ", NULL, -1, -1, SF(ENV), L_ENVIRON, NULL },
{ "vMj ", "%3.3s ", 3, SK_no, SF(FV1), L_stat, NULL },
{ "vMn ", "%3.3s ", 3, SK_no, SF(FV2), L_stat, NULL }
#undef SF #undef SF
}; };
@ -2025,15 +2029,26 @@ static void procs_hlp (proc_t *this) {
calcs and saves that go unused, like the old top! */ calcs and saves that go unused, like the old top! */
PHist_new[Frame_maxtask].pid = this->tid; PHist_new[Frame_maxtask].pid = this->tid;
PHist_new[Frame_maxtask].tics = tics = (this->utime + this->stime); PHist_new[Frame_maxtask].tics = tics = (this->utime + this->stime);
// finally, save major/minor fault counts in case the deltas are displayable
PHist_new[Frame_maxtask].maj = this->maj_flt;
PHist_new[Frame_maxtask].min = this->min_flt;
#ifdef OFF_HST_HASH #ifdef OFF_HST_HASH
// find matching entry from previous frame and make ticks elapsed // find matching entry from previous frame and make stuff elapsed
if ((h = hstbsrch(PHist_sav, maxt_sav - 1, this->tid))) tics -= h->tics; if ((h = hstbsrch(PHist_sav, maxt_sav - 1, this->tid))) {
tics -= h->tics;
this->maj_delta = this->maj_flt - h->maj;
this->min_delta = this->min_flt - h->min;
}
#else #else
// hash & save for the next frame // hash & save for the next frame
hstput(Frame_maxtask); hstput(Frame_maxtask);
// find matching entry from previous frame and make ticks elapsed // find matching entry from previous frame and make stuff elapsed
if ((h = hstget(this->tid))) tics -= h->tics; if ((h = hstget(this->tid))) {
tics -= h->tics;
this->maj_delta = this->maj_flt - h->maj;
this->min_delta = this->min_flt - h->min;
}
#endif #endif
/* we're just saving elapsed tics, to be converted into %cpu if /* we're just saving elapsed tics, to be converted into %cpu if
@ -3719,6 +3734,12 @@ static void task_show (const WIN_t *q, const proc_t *p, char *ptr) {
case P_FL2: case P_FL2:
makeCOL(scale_num(p->min_flt, w, s)); makeCOL(scale_num(p->min_flt, w, s));
break; break;
case P_FV1:
makeCOL(scale_num(p->maj_delta, w, s));
break;
case P_FV2:
makeCOL(scale_num(p->min_delta, w, s));
break;
case P_GID: case P_GID:
makeCOL(p->egid); makeCOL(p->egid);
break; break;

17
top/top.h
View File

@ -167,6 +167,7 @@ enum pflag {
P_OOA, P_OOM, P_OOA, P_OOM,
#endif #endif
P_ENV, P_ENV,
P_FV1, P_FV2,
#ifdef USE_X_COLHDR #ifdef USE_X_COLHDR
// not really pflags, used with tbl indexing // not really pflags, used with tbl indexing
P_MAXPFLGS P_MAXPFLGS
@ -205,23 +206,25 @@ typedef struct FLD_t {
} FLD_t; } FLD_t;
#ifdef OFF_HST_HASH #ifdef OFF_HST_HASH
/* This structure supports 'history' processing and ultimately records /* This structure supports 'history' processing and records the
one piece of critical information from one frame to the next -- bare minimum of needed information from one frame to the next --
we don't calc and save data that goes unused like the old top. */ we don't calc and save data that goes unused like the old top. */
typedef struct HST_t { typedef struct HST_t {
TIC_t tics; // last frame's tics count TIC_t tics; // last frame's tics count
int pid; // record 'key' unsigned long maj, min; // last frame's maj/min_flt counts
int pid; // record 'key'
} HST_t; } HST_t;
#else #else
/* This structure supports 'history' processing and ultimately records /* This structure supports 'history' processing and records the
one piece of critical information from one frame to the next -- bare minimum of needed information from one frame to the next --
we don't calc and save data that goes unused like the old top nor we don't calc and save data that goes unused like the old top nor
do we incure the overhead of sorting to support a binary search do we incure the overhead of sorting to support a binary search
(or worse, a friggin' for loop) when retrieval is necessary! */ (or worse, a friggin' for loop) when retrieval is necessary! */
typedef struct HST_t { typedef struct HST_t {
TIC_t tics; // last frame's tics count TIC_t tics; // last frame's tics count
int pid; // record 'key' unsigned long maj, min; // last frame's maj/min_flt counts
int lnk; // next on hash chain int pid; // record 'key'
int lnk; // next on hash chain
} HST_t; } HST_t;
#endif #endif

2
top/top_nls.c
View File

@ -150,6 +150,8 @@ static void build_desc_nlstab (void) {
/* Translation Hint: The abbreviation 'vars' below is shorthand for /* Translation Hint: The abbreviation 'vars' below is shorthand for
'variables' */ 'variables' */
Desc_nlstab[P_ENV] = _("Environment vars"); Desc_nlstab[P_ENV] = _("Environment vars");
Desc_nlstab[P_FV1] = _("Major Faults delta");
Desc_nlstab[P_FV2] = _("Minor Faults delta");
} }