From 6a368fb7cd1221fa6ea90facc9447c9a2234c255 Mon Sep 17 00:00:00 2001 From: shirou Date: Thu, 11 Jan 2018 11:47:13 +0900 Subject: [PATCH] [process]: add ProcessesWithContext. --- process/process_darwin.go | 4 ++++ process/process_freebsd.go | 4 ++++ process/process_linux.go | 4 ++++ process/process_openbsd.go | 4 ++++ process/process_windows.go | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/process/process_darwin.go b/process/process_darwin.go index 97d1c49..588640a 100644 --- a/process/process_darwin.go +++ b/process/process_darwin.go @@ -523,6 +523,10 @@ func (p *Process) MemoryMapsWithContext(ctx context.Context, grouped bool) (*[]M } func Processes() ([]*Process, error) { + return ProcessesWithContext(context.Background()) +} + +func ProcessesWithContext(ctx context.Context) ([]*Process, error) { results := []*Process{} mib := []int32{CTLKern, KernProc, KernProcAll, 0} diff --git a/process/process_freebsd.go b/process/process_freebsd.go index 29a223a..13b3d88 100644 --- a/process/process_freebsd.go +++ b/process/process_freebsd.go @@ -411,6 +411,10 @@ func (p *Process) MemoryMapsWithContext(ctx context.Context, grouped bool) (*[]M } func Processes() ([]*Process, error) { + return ProcessesWithContext(context.Background()) +} + +func ProcessesWithContext(ctx context.Context) ([]*Process, error) { results := []*Process{} mib := []int32{CTLKern, KernProc, KernProcProc, 0} diff --git a/process/process_linux.go b/process/process_linux.go index 14d151b..7a5ebb0 100644 --- a/process/process_linux.go +++ b/process/process_linux.go @@ -1213,6 +1213,10 @@ func PidsWithContext(ctx context.Context) ([]int32, error) { // Process returns a slice of pointers to Process structs for all // currently running processes. func Processes() ([]*Process, error) { + return ProcessesWithContext(context.Background()) +} + +func ProcessesWithContext(ctx context.Context) ([]*Process, error) { out := []*Process{} pids, err := Pids() diff --git a/process/process_openbsd.go b/process/process_openbsd.go index 857bad0..78631ac 100644 --- a/process/process_openbsd.go +++ b/process/process_openbsd.go @@ -401,6 +401,10 @@ func (p *Process) MemoryMapsWithContext(ctx context.Context, grouped bool) (*[]M } func Processes() ([]*Process, error) { + return ProcessesWithContext(context.Background()) +} + +func ProcessesWithContext(ctx context.Context) ([]*Process, error) { results := []*Process{} buf, length, err := CallKernProcSyscall(KernProcAll, 0) diff --git a/process/process_windows.go b/process/process_windows.go index f1fa1cb..d35fcc2 100644 --- a/process/process_windows.go +++ b/process/process_windows.go @@ -600,6 +600,10 @@ func getFromSnapProcess(pid int32) (int32, int32, string, error) { // Get processes func Processes() ([]*Process, error) { + return ProcessesWithContext(context.Background()) +} + +func ProcessesWithContext(ctx context.Context) ([]*Process, error) { pids, err := Pids() if err != nil { return []*Process{}, fmt.Errorf("could not get Processes %s", err)