summaryrefslogtreecommitdiff
path: root/vendor/github.com/shirou/gopsutil/v4/process
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-07-04 11:12:51 -0600
committermo khan <mo@mokhan.ca>2025-07-04 11:12:51 -0600
commit12736451bf5e7773ff41794d537fa1c3bdbe7912 (patch)
tree082afeaa70151ff071d9063876003bd217fa53fc /vendor/github.com/shirou/gopsutil/v4/process
parenta4d071362fde79e346ae5fe600c16ae71967167f (diff)
chore: update modules
Diffstat (limited to 'vendor/github.com/shirou/gopsutil/v4/process')
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go9
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_linux.go22
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go2
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_posix.go3
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_windows.go3
5 files changed, 17 insertions, 22 deletions
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
index 5afafd8..91f3932 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
@@ -45,7 +45,8 @@ func pidsWithContext(_ context.Context) ([]int32, error) {
return ret, err
}
- for _, proc := range kprocs {
+ for i := range kprocs {
+ proc := &kprocs[i]
ret = append(ret, int32(proc.Proc.P_pid))
}
@@ -74,7 +75,7 @@ func (p *Process) NameWithContext(ctx context.Context) (string, error) {
if err != nil {
return "", err
}
- if len(cmdName) > 0 {
+ if cmdName != "" {
extendedName := filepath.Base(cmdName)
if strings.HasPrefix(extendedName, p.name) {
name = extendedName
@@ -238,7 +239,7 @@ func (p *Process) getKProc() (*unix.KinfoProc, error) {
// Return value deletes Header line(you must not input wrong arg).
// And splited by Space. Caller have responsibility to manage.
// If passed arg pid is 0, get information from all process.
-func callPsWithContext(ctx context.Context, arg string, pid int32, threadOption bool, nameOption bool) ([][]string, error) {
+func callPsWithContext(ctx context.Context, arg string, pid int32, threadOption, nameOption bool) ([][]string, error) {
var cmd []string
switch {
case pid == 0: // will get from all processes.
@@ -396,7 +397,7 @@ func (p *Process) cmdlineSlice() ([]string, error) {
// of the process.
for _, arg := range args[1:] {
argStr = string(arg)
- if len(argStr) > 0 {
+ if argStr != "" {
if nargs > 0 {
argSlice = append(argSlice, argStr)
nargs--
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go b/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
index bf96fd3..f44f6bc 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
@@ -358,7 +358,7 @@ func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
if err != nil {
continue
}
- if int32(ppid) == p.Pid {
+ if ppid == int64(p.Pid) {
np, err := NewProcessWithContext(ctx, int32(pid))
if err != nil {
continue
@@ -372,15 +372,7 @@ func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
func (p *Process) OpenFilesWithContext(ctx context.Context) ([]OpenFilesStat, error) {
_, ofs, err := p.fillFromfdWithContext(ctx)
- if err != nil {
- return nil, err
- }
- ret := make([]OpenFilesStat, len(ofs))
- for i, o := range ofs {
- ret[i] = *o
- }
-
- return ret, nil
+ return ofs, err
}
func (p *Process) ConnectionsWithContext(ctx context.Context) ([]net.ConnectionStat, error) {
@@ -629,17 +621,17 @@ func (p *Process) fillFromfdListWithContext(ctx context.Context) (string, []stri
}
// Get num_fds from /proc/(pid)/fd
-func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []*OpenFilesStat, error) {
+func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []OpenFilesStat, error) {
statPath, fnames, err := p.fillFromfdListWithContext(ctx)
if err != nil {
return 0, nil, err
}
numFDs := int32(len(fnames))
- var openfiles []*OpenFilesStat
+ openfiles := make([]OpenFilesStat, 0, numFDs)
for _, fd := range fnames {
fpath := filepath.Join(statPath, fd)
- filepath, err := os.Readlink(fpath)
+ path, err := common.Readlink(fpath)
if err != nil {
continue
}
@@ -647,8 +639,8 @@ func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []*OpenFile
if err != nil {
return numFDs, openfiles, err
}
- o := &OpenFilesStat{
- Path: filepath,
+ o := OpenFilesStat{
+ Path: path,
Fd: t,
}
openfiles = append(openfiles, o)
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
index 5a6d361..063ff20 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
@@ -358,7 +358,7 @@ func (p *Process) getKProc() (*KinfoProc, error) {
return &k, nil
}
-func callKernProcSyscall(op int32, arg int32) ([]byte, uint64, error) {
+func callKernProcSyscall(op, arg int32) ([]byte, uint64, error) {
mib := []int32{CTLKern, KernProc, op, arg, sizeOfKinfoProc, 0}
mibptr := unsafe.Pointer(&mib[0])
miblen := uint64(len(mib))
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go b/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
index 12d5fe2..9fe55b4 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
@@ -67,7 +67,8 @@ func getTerminalMap() (map[uint64]string, error) {
for _, name := range termfiles {
stat := unix.Stat_t{}
- if err = unix.Stat(name, &stat); err != nil {
+ err = unix.Stat(name, &stat)
+ if err != nil {
return nil, err
}
rdev := uint64(stat.Rdev)
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go b/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
index 6142abc..b4748d3 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
@@ -882,7 +882,8 @@ func getFromSnapProcess(pid int32) (int32, int32, string, error) { //nolint:unpa
defer windows.CloseHandle(snap)
var pe32 windows.ProcessEntry32
pe32.Size = uint32(unsafe.Sizeof(pe32))
- if err = windows.Process32First(snap, &pe32); err != nil {
+ err = windows.Process32First(snap, &pe32)
+ if err != nil {
return 0, 0, "", err
}
for {