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

misc: adapted others to that new proc_t 'cgname' field

Browse Source 
This patch adapts the ps program to a newly add proc_t
field and provides for new support in that top program
along with his man document (ps was already ok there).

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner
2016-07-03 00:00:00 -05:00
committed by Craig Small
parent 5d54dc0d2e
commit eca9168617
5 changed files with 81 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ps/output.c
View File

@ -104,26 +104,6 @@ static int sr_cgroup(const proc_t* a, const proc_t* b)
return strcmp(*a->cgroup, *b->cgroup);
}
static int sr_cgname(const proc_t* a, const proc_t* b)
{
char *aname, *bname;
/* This is a "vector" of one */
if (*a->cgroup == NULL || *b->cgroup == NULL)
return 0;
aname = strstr(*a->cgroup, ":name=");
bname = strstr(*b->cgroup, ":name=");
/* check for missing names, they win */
if (aname == NULL || aname[6] == '\0') {
if (bname == NULL || bname[6] == '\0')
return 0;
return -1;
} else if (bname == NULL || bname[6] == '\0')
return 1;
return strcmp(aname+6,bname+6);
}
#define CMP_STR(NAME) \
static int sr_ ## NAME(const proc_t* P, const proc_t* Q) { \
return strcmp(P->NAME, Q->NAME); \
@ -255,6 +235,7 @@ CMP_NS(userns, USERNS);
CMP_NS(utsns, UTSNS);
CMP_STR(lxcname)
CMP_STR(cgname)
/* approximation to: kB of address space that could end up in swap */
static int sr_swapable(const proc_t* P, const proc_t* Q) {
@ -464,6 +445,13 @@ static int pr_comm(char *restrict const outbuf, const proc_t *restrict const pp)
return max_rightward-rightward;
}
static int pr_cgname(char *restrict const outbuf, const proc_t *restrict const pp){
int rightward = max_rightward;
escaped_copy(outbuf, pp->cgname, OUTBUF_SIZE, &rightward);
return max_rightward-rightward;
}
static int pr_cgroup(char *restrict const outbuf,const proc_t *restrict const pp) {
int rightward = max_rightward;
@ -471,22 +459,6 @@ static int pr_cgroup(char *restrict const outbuf,const proc_t *restrict const pp
return max_rightward-rightward;
}
static int pr_cgname(char *restrict const outbuf,const proc_t *restrict const pp) {
int rightward = max_rightward;
int i;
char *name;
if ((name = strstr(*pp->cgroup, ":name=")) != NULL) {
name += 6;
if (name != '\0') {
escape_str(outbuf, name, OUTBUF_SIZE, &rightward);
return max_rightward - rightward;
}
}
/* fallback: use full cgroup for name */
return pr_cgroup(outbuf, pp);
}
/* Non-standard, from SunOS 5 */
static int pr_fname(char *restrict const outbuf, const proc_t *restrict const pp){
char *endp = outbuf;