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

Jump to bottom

illumos: add some recently-added constants #3999

Merged
merged 1 commit into from
Nov 6, 2024
Merged

illumos: add some recently-added constants #3999

merged 1 commit into from
Nov 6, 2024

Conversation

sunshowers
Copy link
Contributor

@sunshowers sunshowers commented Oct 28, 2024 •
edited
Loading

Description

Constants added from the commit linked below.

Also restored items accidentally deleted in #3864.

Sources

illumos/illumos-gate@0250c53 -- this commit to illumos-gate also includes documentation.

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

@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
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

@rustbot
Copy link
Collaborator

rustbot commented Oct 28, 2024

Some changes occurred in solarish module

cc @jclulow, @pfmooney

@bors
Copy link
Contributor

bors commented Nov 4, 2024

☔ The latest upstream changes (presumably #3864) made this pull request unmergeable. Please resolve the merge conflicts.

@sunshowers sunshowers mentioned this pull request Nov 6, 2024
Merged
@sunshowers
Copy link
Contributor Author

@JohnTitor libc on illumos is currently missing some items accidentally removed in #3864. Could you accept this with a high priority?

@sunshowers
Copy link
Contributor Author

@rustbot label stable-nominated

@rustbot rustbot added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 6, 2024
sunshowers
sunshowers commented Nov 6, 2024
View reviewed changes
src/unix/solarish/illumos.rs
@@ -156,6 +156,8 @@ pub const EFD_SEMAPHORE: ::c_int = 0x1;
pub const EFD_NONBLOCK: ::c_int = 0x800;
pub const EFD_CLOEXEC: ::c_int = 0x80000;

pub const POLLRDHUP: ::c_short = 0x4000;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a revert of #3864.

src/unix/solarish/illumos.rs
Comment on lines +176 to +181
pub const F_DUPFD_CLOFORK: ::c_int = 58;
pub const F_DUP2FD_CLOEXEC: ::c_int = 36;
pub const F_DUP2FD_CLOFORK: ::c_int = 57;
pub const F_DUP3FD: ::c_int = 59;

pub const FD_CLOFORK: ::c_int = 2;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These are new.

src/unix/solarish/illumos.rs
Comment on lines +194 to +199
pub const POSIX_FADV_NORMAL: ::c_int = 0;
pub const POSIX_FADV_RANDOM: ::c_int = 1;
pub const POSIX_FADV_SEQUENTIAL: ::c_int = 2;
pub const POSIX_FADV_WILLNEED: ::c_int = 3;
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Revert.

src/unix/solarish/illumos.rs
Comment on lines +204 to +207
pub const O_CLOFORK: ::c_int = 0x4000000;

pub const MSG_CMSG_CLOEXEC: ::c_int = 0x1000;
pub const MSG_CMSG_CLOFORK: ::c_int = 0x2000;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

New.

src/unix/solarish/illumos.rs
@@ -305,6 +323,7 @@ extern "C" {
stackaddr: *mut ::c_void,
) -> ::c_int;

pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, advice: ::c_int) -> ::c_int;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Revert.

tgross35
tgross35 approved these changes Nov 6, 2024
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.

This looks good to me, I'll give a couple of days for somebody from the solarish pings to double check.

@jclulow
Copy link
Contributor

jclulow commented Nov 6, 2024

I haven't checked the specifics (it's been a rough week!) but I vouch for @sunshowers and we should proceed!

@tgross35 tgross35 added this pull request to the merge queue Nov 6, 2024
@tgross35
Copy link
Contributor

tgross35 commented Nov 6, 2024

Works for me, thanks for the ack!

github-merge-queue bot pushed a commit that referenced this pull request Nov 6, 2024
@tgross35
Merge pull request #3999 from sunshowers/illumos-constants
f0cd000 
[illumos] add some recently-added constants
@tgross35 tgross35 changed the title [illumos] add some recently-added constants illumos: add some recently-added constants Nov 6, 2024
@sunshowers
Copy link
Contributor Author

Apologies. I missed a few items in illumos.txt. Will put up a PR for that shortly.

@tgross35 tgross35 removed this pull request from the merge queue due to a manual request Nov 6, 2024
@tgross35
Copy link
Contributor

tgross35 commented Nov 6, 2024

No problem, you can just update that here

@sunshowers
Copy link
Contributor Author

sunshowers commented Nov 6, 2024 •
edited
Loading

All right, good to go, sorry about the churn!

I'm also working on getting build time libc CI on illumos, which would have caught the regression.

@tgross35
Copy link
Contributor

tgross35 commented Nov 6, 2024 •
edited
Loading

All right, good to go, sorry about the churn!

Not a problem! Thanks for the quick fix.

I'm also working on getting build time libc CI on illumos, which would have caught the regression.

That would be awesome 👍

@sunshowers @tgross35
[illumos] add some recently-added constants
e2a23f0 
Constants added from [this commit].

[this commit]: illumos/illumos-gate@0250c53
@tgross35 tgross35 enabled auto-merge November 6, 2024 20:12
@tgross35 tgross35 added this pull request to the merge queue Nov 6, 2024
Merged via the queue into rust-lang:main with commit b32d59d Nov 6, 2024
42 checks passed
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024
@sunshowers @tgross35
[illumos] add some recently-added constants
aa145fb 
Constants added from [this commit].

[this commit]: illumos/illumos-gate@0250c53

Additionally, resolves some issues introduced in ec3c338 ("Fix tests on
Solaris").

[ add note about fixing ec3c338 - Trevor ]
(backport <rust-lang#3999>)
(cherry picked from commit e2a23f0)
@tgross35 tgross35 mentioned this pull request Nov 7, 2024
Merged
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024
@sunshowers @tgross35
[illumos] add some recently-added constants
635f0ae 
Constants added from [this commit].

[this commit]: illumos/illumos-gate@0250c53

Additionally, resolves some issues introduced in ec3c338 ("Fix tests on
Solaris").

[ add note about fixing ec3c338 - Trevor ]
(backport <rust-lang#3999>)
(cherry picked from commit e2a23f0)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024
@sunshowers @tgross35
[illumos] add some recently-added constants
4c70293 
Constants added from [this commit].

[this commit]: illumos/illumos-gate@0250c53

Additionally, resolves some issues introduced in ec3c338 ("Fix tests on
Solaris").

[ add note about fixing ec3c338 - Trevor ]
(backport <rust-lang#3999>)
(cherry picked from commit e2a23f0)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024
@sunshowers @tgross35
[illumos] add some recently-added constants
143d247 
Constants added from [this commit].

[this commit]: illumos/illumos-gate@0250c53

Additionally, resolves some issues introduced in ec3c338 ("Fix tests on
Solaris").

[ add note about fixing ec3c338 - Trevor ]
(backport <rust-lang#3999>)
(cherry picked from commit e2a23f0)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 7, 2024
@sunshowers @tgross35
[illumos] add some recently-added constants
cd44558 
Constants added from [this commit].

[this commit]: illumos/illumos-gate@0250c53

Additionally, resolves some issues introduced in ec3c338 ("Fix tests on
Solaris").

[ add note about fixing ec3c338 - Trevor ]
(backport <rust-lang#3999>)
(cherry picked from commit e2a23f0)
@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 Nov 7, 2024
@shadow3aaa shadow3aaa mentioned this pull request Nov 8, 2024
Merged
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

@JohnTitor JohnTitor

Labels
S-waiting-on-review 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.
6 participants
@sunshowers @rustbot @bors @jclulow @tgross35 @JohnTitor