Merge pull request #69 from leahneukirchen/rss

psgo: add RSS format

psgo.go

@@ -305,6 +305,11 @@ var (
 			onHost: true,
 			procFn: processHGROUP,
 		},
+		{
+			normal: "rss",
+			header: "RSS",
+			procFn: processRSS,
+		},
 		{
 			normal: "state",
 			header: "STATE",
@@ -862,6 +867,16 @@ func processHGROUP(p *process.Process, ctx *psContext) (string, error) {
 	return "?", nil
 }
 
+// processRSS returns the resident set size of process p in KiB (1024-byte
+// units).
+func processRSS(p *process.Process, ctx *psContext) (string, error) {
+	if p.Status.VMRSS == "" {
+		// probably a kernel thread
+		return "0", nil
+	}
+	return p.Status.VMRSS, nil
+}
+
 // processState returns the process state of process p.
 func processState(p *process.Process, ctx *psContext) (string, error) {
 	return p.Status.State, nil

test/format.bats

@@ -231,6 +231,12 @@ function is_labeling_enabled() {
 	[[ ${lines[0]} =~ "LABEL" ]]
 }
 
+@test "RSS header" {
+	run ./bin/psgo -format "rss"
+	[ "$status" -eq 0 ]
+	[[ ${lines[0]} =~ "RSS" ]]
+}
+
 @test "STATE header" {
 	run ./bin/psgo -format "state"
 	[ "$status" -eq 0 ]
@@ -244,7 +250,7 @@ function is_labeling_enabled() {
 }
 
 @test "ALL header" {
-	run ./bin/psgo -format "pcpu, group, ppid, user, args, comm, rgroup, nice, pid, pgid, etime, ruser, time, tty, vsz, capamb, capinh, capprm, capeff, capbnd, seccomp, hpid, huser, hgroup, state"
+	run ./bin/psgo -format "pcpu, group, ppid, user, args, comm, rgroup, nice, pid, pgid, etime, ruser, time, tty, vsz, capamb, capinh, capprm, capeff, capbnd, seccomp, hpid, huser, hgroup, rss, state"
 	[ "$status" -eq 0 ]
 
 	[[ ${lines[0]} =~ "%CPU" ]]
@@ -270,5 +276,6 @@ function is_labeling_enabled() {
 	[[ ${lines[0]} =~ "HPID" ]]
 	[[ ${lines[0]} =~ "HUSER" ]]
 	[[ ${lines[0]} =~ "HGROUP" ]]
+	[[ ${lines[0]} =~ "RSS" ]]
 	[[ ${lines[0]} =~ "STATE" ]]
 }

test/list.bats

@@ -3,5 +3,5 @@
 @test "List descriptors" {
 	run ./bin/psgo -list
 	[ "$status" -eq 0 ]
-	[[ ${lines[0]} =~ "args, capamb, capbnd, capeff, capinh, capprm, comm, etime, group, hgroup, hpid, huser, label, nice, pcpu, pgid, pid, ppid, rgroup, ruser, seccomp, state, stime, time, tty, user, vsz" ]]
+	[[ ${lines[0]} =~ "args, capamb, capbnd, capeff, capinh, capprm, comm, etime, group, hgroup, hpid, huser, label, nice, pcpu, pgid, pid, ppid, rgroup, rss, ruser, seccomp, state, stime, time, tty, user, vsz" ]]
 }