Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary freebsd logic for finding process executable #668

Merged
merged 1 commit into from
May 9, 2024
Merged

Remove unnecessary freebsd logic for finding process executable #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 2 additions & 58 deletions src/core/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"runtime"
"strings"
"syscall"
"unsafe"

"github.com/google/uuid"
"github.com/klauspost/cpuid/v2"
Expand Down Expand Up @@ -666,14 +665,8 @@ func getNginxProcessExe(nginxProcess *process.Process) string {
if exeErr != nil {
out, commandErr := exec.Command("sh", "-c", "command -v nginx").CombinedOutput()
if commandErr != nil {
// process.Exe() is not implemented yet for FreeBSD.
// This is a temporary workaround until the gopsutil library supports it.
var err error
exe, err = getExe(nginxProcess.Pid)
if err != nil {
log.Tracef("Failed to find exe information for process: %d. Failed for the following errors: %v, %v, %v", nginxProcess.Pid, exeErr, commandErr, err)
log.Errorf("Unable to find NGINX executable for process %d", nginxProcess.Pid)
}
log.Tracef("Failed to find exe information for process: %d. Failed for the following errors: %v, %v", nginxProcess.Pid, exeErr, commandErr)
log.Errorf("Unable to find NGINX executable for process %d", nginxProcess.Pid)
} else {
exe = strings.TrimSuffix(string(out), "\n")
}
Expand All @@ -682,55 +675,6 @@ func getNginxProcessExe(nginxProcess *process.Process) string {
return exe
}

func getExe(pid int32) (string, error) {
mib := []int32{CTLKern, KernProc, KernProcPathname, pid}
buf, _, err := callSyscall(mib)
if err != nil {
return "", err
}

return strings.Trim(string(buf), "\x00"), nil
}

func callSyscall(mib []int32) ([]byte, uint64, error) {
mibptr := unsafe.Pointer(&mib[0])
miblen := uint64(len(mib))

// get required buffer size
length := uint64(0)
_, _, err := unix.Syscall6(
SYS_SYSCTL,
uintptr(mibptr),
uintptr(miblen),
0,
uintptr(unsafe.Pointer(&length)),
0,
0)
if err != 0 {
var b []byte
return b, length, err
}
if length == 0 {
var b []byte
return b, length, err
}
// get proc info itself
buf := make([]byte, length)
_, _, err = unix.Syscall6(
SYS_SYSCTL,
uintptr(mibptr),
uintptr(miblen),
uintptr(unsafe.Pointer(&buf[0])),
uintptr(unsafe.Pointer(&length)),
0,
0)
if err != 0 {
return buf, length, err
}

return buf, length, nil
}

func (env *EnvironmentType) processors(architecture string) (res []*proto.CpuInfo) {
log.Debug("Reading CPU information for dataplane host")
cpus, err := cpu.Info()
Expand Down
60 changes: 2 additions & 58 deletions test/integration/vendor/github.com/nginx/agent/v2/src/core/environment.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 2 additions & 58 deletions test/performance/vendor/github.com/nginx/agent/v2/src/core/environment.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading