Skip to content

Commit

Permalink
Support list of nspids
Browse files Browse the repository at this point in the history
Signed-off-by: Nir Levy <[email protected]>
  • Loading branch information
NirLevy98 committed Aug 20, 2023
1 parent d116efe commit c81b5a7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
27 changes: 18 additions & 9 deletions proc_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ type ProcStatus struct {

// Thread group ID.
TGID int
// Pid namespace.
NSpid int
// List of Pid namespace.
NSpids []uint64

// Peak virtual memory size.
VmPeak uint64 // nolint:revive
Expand Down Expand Up @@ -130,13 +130,7 @@ func (s *ProcStatus) fillStatus(k string, vString string, vUint uint64, vUintByt
case "Gid":
copy(s.GIDs[:], strings.Split(vString, "\t"))
case "NSpid":
if int(vUint) == 0 {
// In case where NSpid has 2 values
nspid, _ := strconv.ParseUint(strings.Split(vString, " ")[0], 10, 64)
s.NSpid = int(nspid)
} else {
s.NSpid = int(vUint)
}
s.NSpids = calcNSPidsList(vString)
case "VmPeak":
s.VmPeak = vUintBytes
case "VmSize":
Expand Down Expand Up @@ -210,3 +204,18 @@ func calcCpusAllowedList(cpuString string) []uint64 {
sort.Slice(g, func(i, j int) bool { return g[i] < g[j] })
return g
}

func calcNSPidsList(nspidsString string) []uint64 {
s := strings.Split(nspidsString, " ")
var nspids []uint64

for _, nspid := range s {
nspid, _ := strconv.ParseUint(nspid, 10, 64)
if nspid == 0 {
continue
}
nspids = append(nspids, nspid)
}

return nspids
}
2 changes: 1 addition & 1 deletion proc_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestProcStatus(t *testing.T) {
}{
{name: "Pid", want: 26231, have: s.PID},
{name: "Tgid", want: 26231, have: s.TGID},
{name: "NSpid", want: 1, have: s.NSpid},
{name: "NSpid", want: 1, have: int(s.NSpids[0])},
{name: "VmPeak", want: 58472 * 1024, have: int(s.VmPeak)},
{name: "VmSize", want: 58440 * 1024, have: int(s.VmSize)},
{name: "VmLck", want: 0 * 1024, have: int(s.VmLck)},
Expand Down

0 comments on commit c81b5a7

Please sign in to comment.