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

refined library i/f and improved performance

Browse Source 
Library changes
   readproc
    . added readeither to more efficiently
      fill both process and thread proc_t
    . added readproctab3, uses readeither
    . included task path support in:
        fill_cgroup_cvt, fill_cmdline_cvt,
        read_unvectored
    . QUICK_THREADS #define allows copying
      process info vs. repeatedly reading
    . simple_nexttid no longer values ppid
    . path var made non-static in readtask
    . documented 'proc_data_t' in .h file
    . tweaked some c comments & formatting
   library.map
    . added new readeither, readproctab3
 Program changes
   ps
    . exploits readproctab3 where possible
    . improved args/comm compliance
   top
    . exploits readeither
This commit is contained in:
Craig Small
2011-08-11 07:42:14 +10:00
parent 3ef4823f90
commit bb4f08ba29
6 changed files with 292 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
top.c
View File

@ -104,7 +104,7 @@ static int No_ksyms = -1, // set to '0' if ksym avail, '1' otherwise
Batch = 0, // batch mode, collect no input, dumb output
Loops = -1, // number of iterations, -1 loops forever
Secure_mode = 0, // set if some functionality restricted
Thread_mode = 0, // set w/ 'H' - show threads via readtask()
Thread_mode = 0, // set w/ 'H' - show threads via readeither()
Width_mode = 0; // set w/ 'w' - potential output override
/* Unchangeable cap's stuff built just once (if at all) and
@ -1913,57 +1913,31 @@ static proc_t **procs_refresh (proc_t **ppt) {
proc_t *ptask = (proc_t *)-1; // first time, Force: (ii)
unsigned curmax = 0; // every time (jeeze)
PROCTAB* PT;
proc_t *pthrd; // for thread hack
proc_t*(*read_something)(PROCTAB*, proc_t*);
prochlp(NULL); // prep for a new frame
if (NULL == (PT = openproc(Frames_libflags, Monpids)))
error_exit(fmtmk("failed openproc: %s", strerror(errno)));
read_something = Thread_mode ? readeither : readproc;
// i) Allocated Chunks: *Existing* table; refresh + reuse
if (!Thread_mode) {
while (curmax < savmax) {
if (!(ptask = readproc(PT, ppt[curmax]))) break;
prochlp(ptask); // tally & complete this proc_t
++curmax;
}
}
else { // acquire as separate threads
while (curmax < savmax) {
if (!(ptask = readproc(PT, NULL))) break;
while (curmax < savmax) {
if (!(pthrd = readtask(PT, ptask, ppt[curmax]))) break;
prochlp(pthrd); // tally & complete this thread
++curmax;
}
freeproc(ptask); // readproc's proc_t not needed
}
while (curmax < savmax) {
if (!(ptask = read_something(PT, ppt[curmax]))) break;
prochlp(ptask); // tally & complete this proc_t
++curmax;
}
// ii) Unallocated Chunks: *New* or *Existing* table; extend + fill
if (!Thread_mode) {
while (ptask) {
// realloc as we go, keeping 'ppt' ahead of 'currmax++'
ppt = alloc_r(ppt, (curmax + 1) * PTRsz);
// here, readproc will allocate the underlying proc_t stg
if ((ptask = readproc(PT, NULL))) {
prochlp(ptask); // tally & complete this proc_t
ppt[curmax++] = ptask;
}
}
}
else { // acquire as separate threads
while (ptask) {
if ((ptask = readproc(PT, NULL))) {
for (;;) {
ppt = alloc_r(ppt, (curmax + 1) * PTRsz);
if (!(pthrd = readtask(PT, ptask, NULL))) break;
prochlp(pthrd); // tally & complete this thread
ppt[curmax++] = pthrd;
}
freeproc(ptask); // readproc's proc_t not needed
}
while (ptask) {
// realloc as we go, keeping 'ppt' ahead of 'currmax++'
ppt = alloc_r(ppt, (curmax + 1) * PTRsz);
// here, the library will allocate the underlying proc_t stg
if ((ptask = read_something(PT, NULL))) {
prochlp(ptask); // tally & complete this proc_t
ppt[curmax++] = ptask;
}
}
closeproc(PT);
// iii) Chunkless: make 'eot' entry, after ensuring proc_t exists