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

top: adapt to a simplified library interface for wchan

Browse Source 
This patch was made necessary by those library changes
in support of recently revised/simplified wchan logic.

Reference(s):
http://www.freelists.org/post/procps/WCHAN,11

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2015-06-18 00:00:00 -05:00 committed by Craig Small
parent caeebdc71f
commit 93666da62c
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
top/top.c
View File

@ -116,9 +116,7 @@ static int Msg_row;
static char Scroll_fmts [SMLBUFSIZ]; static char Scroll_fmts [SMLBUFSIZ];
/* Global/Non-windows mode stuff that is NOT persistent */ /* Global/Non-windows mode stuff that is NOT persistent */
static int No_ksyms = -1, // set to '0' if ksym avail, '1' otherwise static int Batch = 0, // batch mode, collect no input, dumb output
PSDBopen = 0, // set to '1' if psdb opened (now postponed)
Batch = 0, // batch mode, collect no input, dumb output
Loops = -1, // number of iterations, -1 loops forever Loops = -1, // number of iterations, -1 loops forever
Secure_mode = 0, // set if some functionality restricted Secure_mode = 0, // set if some functionality restricted
Thread_mode = 0, // set w/ 'H' - show threads via readeither() Thread_mode = 0, // set w/ 'H' - show threads via readeither()
@ -1901,7 +1899,7 @@ static void build_headers (void) {
#ifdef EQUCOLHDRYES #ifdef EQUCOLHDRYES
int x, hdrmax = 0; int x, hdrmax = 0;
#endif #endif
int i, needpsdb = 0; int i;
Frames_libflags = 0; Frames_libflags = 0;
@ -1919,7 +1917,6 @@ static void build_headers (void) {
#else #else
if (EU_MAXPFLGS <= f) continue; if (EU_MAXPFLGS <= f) continue;
#endif #endif
if (EU_WCH == f) needpsdb = 1;
if (EU_CMD == f && CHKw(w, Show_CMDLIN)) Frames_libflags |= L_CMDLINE; if (EU_CMD == f && CHKw(w, Show_CMDLIN)) Frames_libflags |= L_CMDLINE;
Frames_libflags |= Fieldstab[w->procflgs[i]].lflg; Frames_libflags |= Fieldstab[w->procflgs[i]].lflg;
s = scat(s, justify_pad(N_col(f) s = scat(s, justify_pad(N_col(f)
@ -1961,16 +1958,6 @@ static void build_headers (void) {
} }
#endif #endif
// do we need the kernel symbol table (and is it already open?)
if (needpsdb) {
if (-1 == No_ksyms) {
No_ksyms = 0;
if (open_psdb_message(NULL, library_err))
No_ksyms = 1;
else
PSDBopen = 1;
}
}
// finalize/touchup the libproc PROC_FILLxxx flags for current config... // finalize/touchup the libproc PROC_FILLxxx flags for current config...
if ((Frames_libflags & L_EITHER) && !(Frames_libflags & L_stat)) if ((Frames_libflags & L_EITHER) && !(Frames_libflags & L_stat))
Frames_libflags |= L_status; Frames_libflags |= L_status;
@ -5510,13 +5497,7 @@ static const char *task_show (const WIN_t *q, const proc_t *p) {
cp = scale_mem(S, pages2K(p->size), W, Jn); cp = scale_mem(S, pages2K(p->size), W, Jn);
break; break;
case EU_WCH: case EU_WCH:
{ const char *u; cp = make_str(lookup_wchan(p->tid), W, Js, EU_WCH);
if (No_ksyms)
u = hex_make(p->wchan, 0);
else
u = lookup_wchan(p->wchan, p->tid);
cp = make_str(u, W, Js, EU_WCH);
}
break; break;
default: // keep gcc happy default: // keep gcc happy
continue; continue;