Skip to content

Commit 29e5c7a

Browse files
committed
json: Add cgroup into PRC, PRM outputs
Signed-off-by: Donatas Abraitis <[email protected]>
1 parent 75ed3f9 commit 29e5c7a

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

json.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,8 @@ static void json_print_PRC(char *hp, struct sstat *ss, struct tstat *ps, int nac
10421042
"\"blkdelay\": %lld, "
10431043
"\"nvcsw\": %llu, "
10441044
"\"nivcsw\": %llu, "
1045-
"\"sleepavg\": %d}",
1045+
"\"sleepavg\": %d, "
1046+
"\"cgroup\": \"%s\"}",
10461047
ps->gen.pid,
10471048
ps->cpu.utime,
10481049
ps->cpu.stime,
@@ -1055,7 +1056,8 @@ static void json_print_PRC(char *hp, struct sstat *ss, struct tstat *ps, int nac
10551056
ps->cpu.blkdelay*1000/hertz,
10561057
ps->cpu.nvcsw,
10571058
ps->cpu.nivcsw,
1058-
ps->cpu.sleepavg);
1059+
ps->cpu.sleepavg,
1060+
ps->gen.cgpath[0] ? ps->gen.cgpath:"-");
10591061
}
10601062

10611063
printf("]");
@@ -1086,7 +1088,8 @@ static void json_print_PRM(char *hp, struct sstat *ss, struct tstat *ps, int nac
10861088
"\"vstack\": %lld, "
10871089
"\"vlock\": %lld, "
10881090
"\"vswap\": %lld, "
1089-
"\"pmem\": %lld}",
1091+
"\"pmem\": %lld, "
1092+
"\"cgroup\": \"%s\"}",
10901093
ps->gen.pid,
10911094
ps->mem.vmem,
10921095
ps->mem.rmem,
@@ -1101,7 +1104,8 @@ static void json_print_PRM(char *hp, struct sstat *ss, struct tstat *ps, int nac
11011104
ps->mem.vlock,
11021105
ps->mem.vswap,
11031106
ps->mem.pmem == (unsigned long long)-1LL ?
1104-
0:ps->mem.pmem);
1107+
0:ps->mem.pmem,
1108+
ps->gen.cgpath[0] ? ps->gen.cgpath:"-");
11051109
}
11061110

11071111
printf("]");

0 commit comments

Comments
 (0)