Skip to content

Commit 34e74aa

Browse files
shiroushirou
authored
Merge pull request #1229 from PierreF/darwin-drop-callps-step2
Darwin drop callps step2
2 parents 6918006 + 43e50e1 commit 34e74aa

File tree

7 files changed

+177
-173
lines changed

7 files changed

+177
-173
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ require (
99
github.com/stretchr/testify v1.7.0
1010
github.com/tklauser/go-sysconf v0.3.9
1111
github.com/yusufpapurcu/wmi v1.2.2
12-
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c
12+
golang.org/x/sys v0.0.0-20220111092808-5a964db01320
1313
)

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
2525
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2626
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2727
golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
28-
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
29-
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
28+
golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY=
29+
golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3030
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
3131
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3232
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

‎process/process_darwin.go

+18-134
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import (
1010
"path/filepath"
1111
"strconv"
1212
"strings"
13-
"time"
1413

15-
"github.com/shirou/gopsutil/v3/cpu"
1614
"github.com/shirou/gopsutil/v3/internal/common"
1715
"github.com/shirou/gopsutil/v3/net"
1816
"github.com/tklauser/go-sysconf"
@@ -46,116 +44,69 @@ type _Ctype_struct___0 struct {
4644
func pidsWithContext(ctx context.Context) ([]int32, error) {
4745
var ret []int32
4846

49-
pids, err := callPsWithContext(ctx, "pid", 0, false, false)
47+
kprocs, err := unix.SysctlKinfoProcSlice("kern.proc.all")
5048
if err != nil {
5149
return ret, err
5250
}
5351

54-
for _, pid := range pids {
55-
v, err := strconv.Atoi(pid[0])
56-
if err != nil {
57-
return ret, err
58-
}
59-
ret = append(ret, int32(v))
52+
for _, proc := range kprocs {
53+
ret = append(ret, int32(proc.Proc.P_pid))
6054
}
6155

6256
return ret, nil
6357
}
6458

6559
func (p *Process) PpidWithContext(ctx context.Context) (int32, error) {
66-
r, err := callPsWithContext(ctx, "ppid", p.Pid, false, false)
67-
if err != nil {
68-
return 0, err
69-
}
70-
71-
v, err := strconv.Atoi(r[0][0])
60+
k, err := p.getKProc()
7261
if err != nil {
7362
return 0, err
7463
}
7564

76-
return int32(v), err
65+
return k.Eproc.Ppid, nil
7766
}
7867

7968
func (p *Process) NameWithContext(ctx context.Context) (string, error) {
8069
k, err := p.getKProc()
8170
if err != nil {
8271
return "", err
8372
}
84-
name := common.IntToString(k.Proc.P_comm[:])
73+
74+
name := common.ByteToString(k.Proc.P_comm[:])
8575

8676
if len(name) >= 15 {
8777
cmdName, err := p.cmdNameWithContext(ctx)
8878
if err != nil {
8979
return "", err
9080
}
9181
if len(cmdName) > 0 {
92-
extendedName := filepath.Base(cmdName[0])
82+
extendedName := filepath.Base(cmdName)
9383
if strings.HasPrefix(extendedName, p.name) {
9484
name = extendedName
9585
} else {
96-
name = cmdName[0]
86+
name = cmdName
9787
}
9888
}
9989
}
10090

10191
return name, nil
10292
}
10393

104-
// cmdNameWithContext returns the command name (including spaces) without any arguments
105-
func (p *Process) cmdNameWithContext(ctx context.Context) ([]string, error) {
106-
r, err := callPsWithContext(ctx, "command", p.Pid, false, true)
107-
if err != nil {
108-
return nil, err
109-
}
110-
return r[0], err
111-
}
112-
11394
func (p *Process) createTimeWithContext(ctx context.Context) (int64, error) {
114-
r, err := callPsWithContext(ctx, "etime", p.Pid, false, false)
95+
k, err := p.getKProc()
11596
if err != nil {
11697
return 0, err
11798
}
11899

119-
elapsedSegments := strings.Split(strings.Replace(r[0][0], "-", ":", 1), ":")
120-
var elapsedDurations []time.Duration
121-
for i := len(elapsedSegments) - 1; i >= 0; i-- {
122-
p, err := strconv.ParseInt(elapsedSegments[i], 10, 0)
123-
if err != nil {
124-
return 0, err
125-
}
126-
elapsedDurations = append(elapsedDurations, time.Duration(p))
127-
}
128-
129-
elapsed := time.Duration(elapsedDurations[0]) * time.Second
130-
if len(elapsedDurations) > 1 {
131-
elapsed += time.Duration(elapsedDurations[1]) * time.Minute
132-
}
133-
if len(elapsedDurations) > 2 {
134-
elapsed += time.Duration(elapsedDurations[2]) * time.Hour
135-
}
136-
if len(elapsedDurations) > 3 {
137-
elapsed += time.Duration(elapsedDurations[3]) * time.Hour * 24
138-
}
139-
140-
start := time.Now().Add(-elapsed)
141-
return start.Unix() * 1000, nil
100+
return k.Proc.P_starttime.Sec*1000 + int64(k.Proc.P_starttime.Usec)/1000, nil
142101
}
143102

144103
func (p *Process) ParentWithContext(ctx context.Context) (*Process, error) {
145-
out, err := common.CallLsofWithContext(ctx, invoke, p.Pid, "-FR")
104+
ppid, err := p.PpidWithContext(ctx)
146105
if err != nil {
147106
return nil, err
148107
}
149-
for _, line := range out {
150-
if len(line) >= 1 && line[0] == 'R' {
151-
v, err := strconv.Atoi(line[1:])
152-
if err != nil {
153-
return nil, err
154-
}
155-
return NewProcessWithContext(ctx, int32(v))
156-
}
157-
}
158-
return nil, fmt.Errorf("could not find parent line")
108+
109+
return NewProcessWithContext(ctx, ppid)
159110
}
160111

161112
func (p *Process) StatusWithContext(ctx context.Context) ([]string, error) {
@@ -188,7 +139,7 @@ func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
188139
}
189140

190141
// See: http://unix.superglobalmegacorp.com/Net2/newsrc/sys/ucred.h.html
191-
userEffectiveUID := int32(k.Eproc.Ucred.UID)
142+
userEffectiveUID := int32(k.Eproc.Ucred.Uid)
192143

193144
return []int32{userEffectiveUID}, nil
194145
}
@@ -200,7 +151,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
200151
}
201152

202153
gids := make([]int32, 0, 3)
203-
gids = append(gids, int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Ucred.Ngroups), int32(k.Eproc.Pcred.P_svgid))
154+
gids = append(gids, int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Pcred.P_svgid))
204155

205156
return gids, nil
206157
}
@@ -250,14 +201,6 @@ func (p *Process) IOCountersWithContext(ctx context.Context) (*IOCountersStat, e
250201
return nil, common.ErrNotImplementedError
251202
}
252203

253-
func (p *Process) NumThreadsWithContext(ctx context.Context) (int32, error) {
254-
r, err := callPsWithContext(ctx, "utime,stime", p.Pid, true, false)
255-
if err != nil {
256-
return 0, err
257-
}
258-
return int32(len(r)), nil
259-
}
260-
261204
func convertCPUTimes(s string) (ret float64, err error) {
262205
var t int
263206
var _tmp string
@@ -304,56 +247,6 @@ func convertCPUTimes(s string) (ret float64, err error) {
304247
return float64(t) / float64(clockTicks), nil
305248
}
306249

307-
func (p *Process) TimesWithContext(ctx context.Context) (*cpu.TimesStat, error) {
308-
r, err := callPsWithContext(ctx, "utime,stime", p.Pid, false, false)
309-
if err != nil {
310-
return nil, err
311-
}
312-
313-
utime, err := convertCPUTimes(r[0][0])
314-
if err != nil {
315-
return nil, err
316-
}
317-
stime, err := convertCPUTimes(r[0][1])
318-
if err != nil {
319-
return nil, err
320-
}
321-
322-
ret := &cpu.TimesStat{
323-
CPU: "cpu",
324-
User: utime,
325-
System: stime,
326-
}
327-
return ret, nil
328-
}
329-
330-
func (p *Process) MemoryInfoWithContext(ctx context.Context) (*MemoryInfoStat, error) {
331-
r, err := callPsWithContext(ctx, "rss,vsize,pagein", p.Pid, false, false)
332-
if err != nil {
333-
return nil, err
334-
}
335-
rss, err := strconv.Atoi(r[0][0])
336-
if err != nil {
337-
return nil, err
338-
}
339-
vms, err := strconv.Atoi(r[0][1])
340-
if err != nil {
341-
return nil, err
342-
}
343-
pagein, err := strconv.Atoi(r[0][2])
344-
if err != nil {
345-
return nil, err
346-
}
347-
348-
ret := &MemoryInfoStat{
349-
RSS: uint64(rss) * 1024,
350-
VMS: uint64(vms) * 1024,
351-
Swap: uint64(pagein),
352-
}
353-
354-
return ret, nil
355-
}
356-
357250
func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
358251
pids, err := common.CallPgrepWithContext(ctx, invoke, p.Pid)
359252
if err != nil {
@@ -399,17 +292,8 @@ func ProcessesWithContext(ctx context.Context) ([]*Process, error) {
399292

400293
// Returns a proc as defined here:
401294
// http://unix.superglobalmegacorp.com/Net2/newsrc/sys/kinfo_proc.h.html
402-
func (p *Process) getKProc() (*KinfoProc, error) {
403-
buf, err := unix.SysctlRaw("kern.proc.pid", int(p.Pid))
404-
if err != nil {
405-
return nil, err
406-
}
407-
k, err := parseKinfoProc(buf)
408-
if err != nil {
409-
return nil, err
410-
}
411-
412-
return &k, nil
295+
func (p *Process) getKProc() (*unix.KinfoProc, error) {
296+
return unix.SysctlKinfoProc("kern.proc.pid", int(p.Pid))
413297
}
414298

415299
// call ps command.

0 commit comments

Comments
 (0)