Skip to content

local_file_system.cpp: minor fix for macOS libproc code #10758

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

Merged
Mytherin merged 2 commits into from
Feb 20, 2024
Merged

local_file_system.cpp: minor fix for macOS libproc code #10758

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46d2fc5
local_file_system.cpp: minor fix for macOS libproc code
barracuda156 Feb 19, 2024
727d211
Disable for older MacOS versions
Mytherin Feb 20, 2024
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
5 changes: 5 additions & 0 deletions src/common/local_file_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ static string AdditionalProcessInfo(FileSystem &fs, pid_t pid) {
}

string process_name, process_owner;
// macOS >= 10.7 has PROC_PIDT_SHORTBSDINFO
#ifdef PROC_PIDT_SHORTBSDINFO
// try to find out more about the process holding the lock
struct proc_bsdshortinfo proc;
if (proc_pidinfo(pid, PROC_PIDT_SHORTBSDINFO, 0, &proc, PROC_PIDT_SHORTBSDINFO_SIZE) ==
Expand All @@ -199,6 +201,9 @@ static string AdditionalProcessInfo(FileSystem &fs, pid_t pid) {
process_owner = pw->pw_name;
}
}
#else
return string();
#endif
// try to get a better process name (full path)
char full_exec_path[PROC_PIDPATHINFO_MAXSIZE];
if (proc_pidpath(pid, full_exec_path, PROC_PIDPATHINFO_MAXSIZE) > 0) {
Expand Down