mirror of
git://slackware.nl/current.git
synced 2025-01-30 08:38:10 +01:00
66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
|
diff -burN procps-3.2.8/ps/output.c procps-3.2.8.cgroups/ps/output.c
|
||
|
|
--- procps-3.2.8/ps/output.c 2009-05-10 14:24:50.000000000 -0500
|
||
|
|
+++ procps-3.2.8.cgroups/ps/output.c 2010-12-04 12:35:56.000000000 -0600
|
||
|
|
@@ -1099,6 +1099,39 @@
|
||
|
|
return snprintf(outbuf, COLWID, "*");
|
||
|
|
}
|
||
|
|
|
||
|
|
+static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){
|
||
|
|
+ char filename[48];
|
||
|
|
+ FILE *fd;
|
||
|
|
+ int counter = 0;
|
||
|
|
+ int c;
|
||
|
|
+ int is_cgroup = 0;
|
||
|
|
+
|
||
|
|
+ outbuf[0]='\0';
|
||
|
|
+ snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid);
|
||
|
|
+ fd = fopen(filename, "r");
|
||
|
|
+ if (likely(fd == NULL)) goto fail;
|
||
|
|
+ while (( (c = fgetc(fd)) != EOF) && (counter<665)) {
|
||
|
|
+ if (is_cgroup == 0) {
|
||
|
|
+ if (c == ':') {
|
||
|
|
+ is_cgroup = 1;
|
||
|
|
+ if (counter>0)
|
||
|
|
+ outbuf[counter++]=';';
|
||
|
|
+ }
|
||
|
|
+ }else
|
||
|
|
+ if ((c == '\n') || (c == '\0'))
|
||
|
|
+ is_cgroup = 0;
|
||
|
|
+ else
|
||
|
|
+ outbuf[counter++]=c;
|
||
|
|
+ }
|
||
|
|
+ outbuf[counter]='\0';
|
||
|
|
+ close(fd);
|
||
|
|
+ if (counter>0)
|
||
|
|
+ return counter;
|
||
|
|
+fail:
|
||
|
|
+ outbuf[0] = '-';
|
||
|
|
+ outbuf[1] = '\0';
|
||
|
|
+ return 1;
|
||
|
|
+}
|
||
|
|
|
||
|
|
/****************** FLASK & seLinux security stuff **********************/
|
||
|
|
// move the bulk of this to libproc sometime
|
||
|
|
@@ -1293,6 +1326,7 @@
|
||
|
|
{"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT},
|
||
|
|
{"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT},
|
||
|
|
{"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/
|
||
|
|
+{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/
|
||
|
|
{"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT},
|
||
|
|
{"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/
|
||
|
|
{"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT},
|
||
|
|
diff -burN procps-3.2.8/ps/ps.1 procps-3.2.8.cgroups/ps/ps.1
|
||
|
|
--- procps-3.2.8/ps/ps.1 2009-05-10 14:38:17.000000000 -0500
|
||
|
|
+++ procps-3.2.8.cgroups/ps/ps.1 2010-12-04 12:43:12.000000000 -0600
|
||
|
|
@@ -904,6 +904,10 @@
|
||
|
|
displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR).
|
||
|
|
T}
|
||
|
|
|
||
|
|
+cgroup CGROUP T{
|
||
|
|
+display control groups to which the process belongs.
|
||
|
|
+T}
|
||
|
|
+
|
||
|
|
class CLS T{
|
||
|
|
scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR).
|
||
|
|
Field's possible values are:
|