Correct the definition of pthread_t on Darwin

[chengr4]

Description

This PR fixes #2903. This PR picks up the work started by @highjeans in #4336 (close #4336) which had stalled. I just followed up the comments from @tgross35 in the PR and tried to finish it.

Thanks for leaving a great start point to study this crate.

Closes: #4336

Sources

• https://github.com/apple-oss-distributions/xnu/blob/8d741a5de7ff4191bf97d57b9f54c2f6d4a15585/EXTERNAL_HEADERS/sys/_pthread/_pthread_types.h#L103
• https://github.com/apple-oss-distributions/libpthread/blob/main/include/sys/_pthread/_pthread_t.h#L31

Checklist

• Relevant tests in libc-test/semver have been updated
• No placeholder or unstable values like *LAST or *MAX are
  included (see #3131)
• Tested locally (cd libc-test && cargo test --target mytarget);
  especially relevant for platforms that may not be checked in CI

[chengr4]

Hi @tgross35,

Could you help me understand why pub use new::*; and pub use crate::unix::*; in src/lib.rs conflict with each other, while other modules do not?

[highjeans]

Hi @chengr4, thanks for finishing this! I really wanted to do this myself but I got caught up in a bunch of work for my university so I ended up forgetting about this.

One thing to note, since now opaque_pthread_t is now just an empty enum, we dont need any of the new constants defined in apple/b32/mod.rs and apple/b64/mod.rs.

Also make sure to run the style checker in /ci/style.py before this is ready!

[chengr4]

@highjeans Thank for answering; I totally forgot 🫠. Again, Thanks for leaving the PR for me to study this crate.

@tgross35

Actually, I failed cargo test --test ctest at my local.

bad `ELAST` value at byte 0: rust: 106 (0x6a) != c 107 (0x6b)
    rust bytes: 6a 00 00 00
    c bytes:    6b 00 00 00
bad `HOST_VM_INFO64_COUNT` value at byte 0: rust: 38 (0x26) != c 40 (0x28)
    rust bytes: 26 00 00 00
    c bytes:    28 00 00 00
bad `vm_statistics64_data_t` size: rust: 152 != c 160
bad `vm_statistics64` size: rust: 152 != c 160
size of `vm_statistics64_data_t` is 160 in C and 152 in Rust

size of `struct vm_statistics64` is 160 in C and 152 in Rust

Can you please guide me how to evaluate and fix this bug?

[JohnTitor]

@chengr4 because your system has different version(s) than CI, I think. It's fine as long as CI passes (unless it's unspported).
Could you squash commits into one? Otherwise LGTM on my end.

[chengr4]

ok will do it after 6/12

[rustbot]

⚠️ Warning ⚠️

• The following commits have merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

  • 48b9de4
  • 8924db4

  You can start a rebase with the following commands:

  $ # rebase
  $ git pull --rebase https://github.com/rust-lang/libc.git main
  $ git push --force-with-lease
  

[chengr4]

@JohnTitor if commit mesage is not clear enough, help me fix it. Thanks

[tgross35]

Regarding the commit: whoever submits the final patch should be listed as the author, which in this case is you. You can change the author field with git commit --amend --reset-author.

However, of course you also need to give credit to anyone who contributed to the patch, which you can add with:

Co-authored-by: highjeans <foo@bar.com>

at the end of the commit (get their email from the commit log before you reset it)

View changes since this review

[tgross35]

This macro's syntax changed recently, you'll need to rebase then this can become pub type _opaque_pthread_t;.

However, could you try making it non-pub? Since we don't care about the internals. You may need a #[allow(private_interfaces)] on pthread_t.

[chengr4]

I tried making _opaque_pthread_t non-pub, but it caused numerous compiler errors and warnings regarding private_interfaces

E.g.

error: type `_opaque_pthread_t` is private
  --> src/new/apple/libpthread/pthread_/introspection.rs:27:17
   |
27 |         thread: pthread_t,
   |                 ^^^^^^^^^ private type

error: type `_opaque_pthread_t` is private
  --> src/new/apple/libpthread/pthread_/introspection.rs:33:17
   |
33 |         thread: pthread_t,
   |                 ^^^^^^^^^ private type

error: type `_opaque_pthread_t` is private
 --> src/new/apple/libpthread/pthread_/pthread_spis.rs:9:17
  |
9 |         thread: *mut crate::pthread_t,
  |                 ^^^^^^^^^^^^^^^^^^^^^ private type

[tgross35]

Feel free to change these here since you've already done the work

[chengr4]

I can take it over after the apples look good to you.

[rustbot]

Reminder, once the PR becomes ready for a review, use @rustbot ready.

[rustbot]

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.