remove Refresh func.

pull/4/head
WAKAYAMA shirou 11 years ago
parent 96547e0d22
commit cd6357f221

@ -23,29 +23,6 @@ func Pids() ([]int32, error) {
return ret, nil return ret, nil
} }
// Refresh reloads all the data associated with this process.
func (p *Process) Refresh() error {
mib := []int32{CTL_KERN, KERN_PROC, KERN_PROC_PID, p.Pid}
buf, length, err := call_syscall(mib)
if err != nil {
return err
}
proc_k := Kinfo_proc{}
if length != uint64(unsafe.Sizeof(proc_k)) {
return err
}
k, err := parse_kinfo_proc(buf)
if err != nil {
return err
}
copy_params(&k, p)
return nil
}
func copy_params(k *Kinfo_proc, p *Process) error { func copy_params(k *Kinfo_proc, p *Process) error {
p.Exe = byteToString(k.Ki_comm[:]) p.Exe = byteToString(k.Ki_comm[:])
p.Ppid = k.Ki_ppid p.Ppid = k.Ki_ppid
@ -53,17 +30,6 @@ func copy_params(k *Kinfo_proc, p *Process) error {
return nil return nil
} }
func findProcess(pid int32) (*Process, error) {
mib := []int32{CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid}
_, _, err := call_syscall(mib)
if err != nil {
return &Process{}, err
}
return newProcess(pid)
}
func processes() ([]Process, error) { func processes() ([]Process, error) {
results := make([]Process, 0, 50) results := make([]Process, 0, 50)
@ -85,7 +51,7 @@ func processes() ([]Process, error) {
if err != nil { if err != nil {
continue continue
} }
p, err := newProcess(int32(k.Ki_pid)) p, err := NewProcess(int32(k.Ki_pid))
if err != nil { if err != nil {
continue continue
} }
@ -146,7 +112,24 @@ func call_syscall(mib []int32) ([]byte, uint64, error) {
return buf, length, nil return buf, length, nil
} }
func newProcess(pid int32) (*Process, error) { func NewProcess(pid int32) (*Process, error) {
p := &Process{Pid: pid} p := &Process{Pid: pid}
return p, p.Refresh() mib := []int32{CTL_KERN, KERN_PROC, KERN_PROC_PID, p.Pid}
buf, length, err := call_syscall(mib)
if err != nil {
return nil, err
}
proc_k := Kinfo_proc{}
if length != uint64(unsafe.Sizeof(proc_k)) {
return nil, err
}
k, err := parse_kinfo_proc(buf)
if err != nil {
return nil, err
}
copy_params(&k, p)
return p, nil
} }

Loading…
Cancel
Save