@@ -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,99 +44,60 @@ type _Ctype_struct___0 struct {
4644func 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
6559func (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
7968func (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-
11394func (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
144103func (p * Process ) StatusWithContext (ctx context.Context ) ([]string , error ) {
@@ -171,7 +130,7 @@ func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
171130 }
172131
173132 // See: http://unix.superglobalmegacorp.com/Net2/newsrc/sys/ucred.h.html
174- userEffectiveUID := int32 (k .Eproc .Ucred .UID )
133+ userEffectiveUID := int32 (k .Eproc .Ucred .Uid )
175134
176135 return []int32 {userEffectiveUID }, nil
177136}
@@ -183,7 +142,7 @@ func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
183142 }
184143
185144 gids := make ([]int32 , 0 , 3 )
186- gids = append (gids , int32 (k .Eproc .Pcred .P_rgid ), int32 (k .Eproc .Ucred . Ngroups ), int32 (k .Eproc .Pcred .P_svgid ))
145+ gids = append (gids , int32 (k .Eproc .Pcred .P_rgid ), int32 (k .Eproc .Pcred . P_rgid ), int32 (k .Eproc .Pcred .P_svgid ))
187146
188147 return gids , nil
189148}
@@ -233,14 +192,6 @@ func (p *Process) IOCountersWithContext(ctx context.Context) (*IOCountersStat, e
233192 return nil , common .ErrNotImplementedError
234193}
235194
236- func (p * Process ) NumThreadsWithContext (ctx context.Context ) (int32 , error ) {
237- r , err := callPsWithContext (ctx , "utime,stime" , p .Pid , true , false )
238- if err != nil {
239- return 0 , err
240- }
241- return int32 (len (r )), nil
242- }
243-
244195func convertCPUTimes (s string ) (ret float64 , err error ) {
245196 var t int
246197 var _tmp string
@@ -287,56 +238,6 @@ func convertCPUTimes(s string) (ret float64, err error) {
287238 return float64 (t ) / float64 (clockTicks ), nil
288239}
289240
290- func (p * Process ) TimesWithContext (ctx context.Context ) (* cpu.TimesStat , error ) {
291- r , err := callPsWithContext (ctx , "utime,stime" , p .Pid , false , false )
292- if err != nil {
293- return nil , err
294- }
295-
296- utime , err := convertCPUTimes (r [0 ][0 ])
297- if err != nil {
298- return nil , err
299- }
300- stime , err := convertCPUTimes (r [0 ][1 ])
301- if err != nil {
302- return nil , err
303- }
304-
305- ret := & cpu.TimesStat {
306- CPU : "cpu" ,
307- User : utime ,
308- System : stime ,
309- }
310- return ret , nil
311- }
312-
313- func (p * Process ) MemoryInfoWithContext (ctx context.Context ) (* MemoryInfoStat , error ) {
314- r , err := callPsWithContext (ctx , "rss,vsize,pagein" , p .Pid , false , false )
315- if err != nil {
316- return nil , err
317- }
318- rss , err := strconv .Atoi (r [0 ][0 ])
319- if err != nil {
320- return nil , err
321- }
322- vms , err := strconv .Atoi (r [0 ][1 ])
323- if err != nil {
324- return nil , err
325- }
326- pagein , err := strconv .Atoi (r [0 ][2 ])
327- if err != nil {
328- return nil , err
329- }
330-
331- ret := & MemoryInfoStat {
332- RSS : uint64 (rss ) * 1024 ,
333- VMS : uint64 (vms ) * 1024 ,
334- Swap : uint64 (pagein ),
335- }
336-
337- return ret , nil
338- }
339-
340241func (p * Process ) ChildrenWithContext (ctx context.Context ) ([]* Process , error ) {
341242 pids , err := common .CallPgrepWithContext (ctx , invoke , p .Pid )
342243 if err != nil {
@@ -382,17 +283,8 @@ func ProcessesWithContext(ctx context.Context) ([]*Process, error) {
382283
383284// Returns a proc as defined here:
384285// http://unix.superglobalmegacorp.com/Net2/newsrc/sys/kinfo_proc.h.html
385- func (p * Process ) getKProc () (* KinfoProc , error ) {
386- buf , err := unix .SysctlRaw ("kern.proc.pid" , int (p .Pid ))
387- if err != nil {
388- return nil , err
389- }
390- k , err := parseKinfoProc (buf )
391- if err != nil {
392- return nil , err
393- }
394-
395- return & k , nil
286+ func (p * Process ) getKProc () (* unix.KinfoProc , error ) {
287+ return unix .SysctlKinfoProc ("kern.proc.pid" , int (p .Pid ))
396288}
397289
398290// call ps command.
0 commit comments