Lomanic
/
gopsutil
mirror of https://github.com/shirou/gopsutil
1
0
Fork 0
Code Issues Releases Activity

Groups in /proc/PID/status has type uint32.

Browse Source 
Fix error of parser:
> error get info about worker process status 3150292: strconv.ParseInt:
> parsing "4294967293": value out of range

$ grep Groups /proc/self/status
Groups: 20001 [...] 4294967293
pull/1628/head
Sergey Chernomorets 2 years ago committed by shirou
parent f9c39a6d8f
commit aace5e9d8f
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

4
process/process.go
Unescape Escape View File

@ -32,7 +32,7 @@ type Process struct {
numCtxSwitches *NumCtxSwitchesStat numCtxSwitches *NumCtxSwitchesStat
uids []int32 uids []int32
gids []int32 gids []int32
groups []int32 groups []uint32
numThreads int32 numThreads int32
memInfo *MemoryInfoStat memInfo *MemoryInfoStat
sigInfo *SignalInfoStat sigInfo *SignalInfoStat
@ -369,7 +369,7 @@ func (p *Process) CPUPercentWithContext(ctx context.Context) (float64, error) {
} }
// Groups returns all group IDs(include supplementary groups) of the process as a slice of the int // Groups returns all group IDs(include supplementary groups) of the process as a slice of the int
func (p *Process) Groups() ([]int32, error) { func (p *Process) Groups() ([]uint32, error) {
return p.GroupsWithContext(context.Background()) return p.GroupsWithContext(context.Background())
} }

2
process/process_darwin.go
Unescape Escape View File

@ -141,7 +141,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return gids, nil return gids, nil
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
// k, err := p.getKProc() // k, err := p.getKProc()
// if err != nil { // if err != nil {

2
process/process_fallback.go
Unescape Escape View File

@ -90,7 +90,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }

6
process/process_freebsd.go
Unescape Escape View File

@ -182,15 +182,15 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return gids, nil return gids, nil
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc() k, err := p.getKProc()
if err != nil { if err != nil {
return nil, err return nil, err
} }
groups := make([]int32, k.Ngroups) groups := make([]uint32, k.Ngroups)
for i := int16(0); i < k.Ngroups; i++ { for i := int16(0); i < k.Ngroups; i++ {
groups[i] = int32(k.Groups[i]) groups[i] = uint32(k.Groups[i])
} }
return groups, nil return groups, nil

10
process/process_linux.go
Unescape Escape View File

@ -164,10 +164,10 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return p.gids, nil return p.gids, nil
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
err := p.fillFromStatusWithContext(ctx) err := p.fillFromStatusWithContext(ctx)
if err != nil { if err != nil {
return []int32{}, err return []uint32{}, err
} }
return p.groups, nil return p.groups, nil
} }
@ -885,13 +885,13 @@ func (p *Process) fillFromStatusWithContext(ctx context.Context) error {
} }
case "Groups": case "Groups":
groups := strings.Fields(value) groups := strings.Fields(value)
p.groups = make([]int32, 0, len(groups)) p.groups = make([]uint32, 0, len(groups))
for _, i := range groups { for _, i := range groups {
v, err := strconv.ParseInt(i, 10, 32) v, err := strconv.ParseUint(i, 10, 32)
if err != nil { if err != nil {
return err return err
} }
p.groups = append(p.groups, int32(v)) p.groups = append(p.groups, uint32(v))
} }
case "Threads": case "Threads":
v, err := strconv.ParseInt(value, 10, 32) v, err := strconv.ParseInt(value, 10, 32)

2
process/process_openbsd.go
Unescape Escape View File

@ -201,7 +201,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return gids, nil return gids, nil
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc() k, err := p.getKProc()
if err != nil { if err != nil {
return nil, err return nil, err

2
process/process_plan9.go
Unescape Escape View File

@ -90,7 +90,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }

2
process/process_solaris.go
Unescape Escape View File

@ -104,7 +104,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }

2
process/process_windows.go
Unescape Escape View File

@ -474,7 +474,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }
func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) { func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }

Write Preview
Loading…
Cancel
Save