Skip to content

Add missing macos proc types and constants #4310

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

Jump to bottom
Merged
merged 1 commit into from
Mar 11, 2025
Merged

Add missing macos proc types and constants #4310

merged 1 commit into from
Mar 11, 2025

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Mar 9, 2025 •
edited by tgross35
Loading

@rustbot
Copy link
Collaborator

rustbot commented Mar 9, 2025

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@tgross35
Copy link
Contributor

proc_fdinfo can go in s! rather than s_no_extra_traits! to make the error go away.

Any chance these headers or at least a manpage are online for a permalink? I didn't find anything from a quick search.

tgross35
tgross35 reviewed Mar 10, 2025
View reviewed changes
src/unix/bsd/apple/mod.rs Outdated
@@ -4968,6 +4973,19 @@ pub const PROC_PIDTASKINFO: c_int = 4;
pub const PROC_PIDTHREADINFO: c_int = 5;
pub const PROC_PIDVNODEPATHINFO: c_int = 9;
pub const PROC_PIDPATHINFO_MAXSIZE: c_int = 4096;

pub const PROC_PIDLISTFDS: c_int = 1;
pub const PROC_PIDLISTFD_SIZE: c_int = 8;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be core::mem::size_of::<proc_fdinfo>() to match the headers?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't realize the MSRV was updated, then definitely!

@tgross35
Copy link
Contributor

I always need to remember to search xnu, looks like the sources are https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/bsd/sys/proc_info.h#L673-L676, https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/bsd/sys/proc_info.h#L718-L719, and https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/bsd/sys/proc_info.h#L661-L671. Is there any reason to omit PROX_FDTYPE_CHANNEL and PROX_FDTYPE_NEXUS?

@GuillaumeGomez
Copy link
Member Author

I always need to remember to search xnu, looks like the sources are https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/bsd/sys/proc_info.h#L673-L676, https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/bsd/sys/proc_info.h#L718-L719, and https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/bsd/sys/proc_info.h#L661-L671. Is there any reason to omit PROX_FDTYPE_CHANNEL and PROX_FDTYPE_NEXUS?

My sources must be older, they weren't listed. Adding them.

@GuillaumeGomez
Copy link
Member Author

Updated.

tgross35
tgross35 approved these changes Mar 11, 2025
View reviewed changes
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@tgross35 tgross35 added this pull request to the merge queue Mar 11, 2025
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Mar 11, 2025
Merged via the queue into rust-lang:main with commit 1c65dda Mar 11, 2025
43 checks passed
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Mar 11, 2025
@GuillaumeGomez @tgross35
Add missing macos proc types and constants
5746f8e 
(backport <rust-lang#4310>)
(cherry picked from commit f3c54e8)
@tgross35 tgross35 mentioned this pull request Mar 11, 2025
Merged
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Mar 11, 2025
@GuillaumeGomez GuillaumeGomez deleted the mac-proc-info branch March 11, 2025 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgross35 tgross35 tgross35 approved these changes

Assignees

@tgross35 tgross35

Labels
O-macos O-unix S-waiting-on-author stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GuillaumeGomez @rustbot @tgross35