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

Add support for SIGSYS in signalfd #1121

Merged
merged 2 commits into from
Nov 10, 2018
Merged

Add support for SIGSYS in signalfd #1121

merged 2 commits into from
Nov 10, 2018

Conversation

picostove
Copy link

Linux 4.18 added support for SIGSYS info in signalfd. Add the new
fields to signalfd_siginfo.

While the kernel has support for these new fields now, no libc has
shipped a release with the new signalfd fields.

Add support for SIGSYS in signalfd
60ab304 
Linux 4.18 added support for SIGSYS info in signalfd. Add the new
fields to signalfd_siginfo.

While the kernel has support for these new fields now, no libc has
shipped a release with the new signalfd fields.
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 7, 2018

r? @gnzlbg

@rust-highfive rust-highfive assigned gnzlbg and unassigned alexcrichton Nov 7, 2018
@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 7, 2018

@smibarber thank you for the PR! It seems that the android builds are breaking, could you take a look?

argo:warning=                     return &b->ssi_ptr;
cargo:warning=                     ^
cargo:warning=/checkout/target/aarch64-linux-android/debug/build/libc-test-a8b4e1091355aa7f/out/main.c: In function '__test_field_type_signalfd_siginfo_ssi_utime':
cargo:warning=/checkout/target/aarch64-linux-android/debug/build/libc-test-a8b4e1091355aa7f/out/main.c:10455:21: error: return from incompatible pointer type [-Werror]
cargo:warning=                     return &b->ssi_utime;
cargo:warning=                     ^
cargo:warning=/checkout/target/aarch64-linux-android/debug/build/libc-test-a8b4e1091355aa7f/out/main.c: In function '__test_field_type_signalfd_siginfo_ssi_stime':
cargo:warning=/checkout/target/aarch64-linux-android/debug/build/libc-test-a8b4e1091355aa7f/out/main.c:10469:21: error: return from incompatible pointer type [-Werror]
cargo:warning=                     return &b->ssi_stime;
cargo:warning=                     ^
cargo:warning=/checkout/target/aarch64-linux-android/debug/build/libc-test-a8b4e1091355aa7f/out/main.c: In function '__test_field_type_signalfd_siginfo_ssi_addr':
cargo:warning=/checkout/target/aarch64-linux-android/debug/build/libc-test-a8b4e1091355aa7f/out/main.c:10483:21: error: return from incompatible pointer type [-Werror]
cargo:warning=                     return &b->ssi_addr;
cargo:warning=                     ^
cargo:warning=cc1: all warnings being treated as errors

Sadly the error message does not appear to mention the pointer types involved =/

android: restore signalfd fields to c_ulonglong
2475278 
Android's NDK typedefs __u64 as unsigned long long.
@picostove
Copy link
Author

Yikes, I copied the entire struct to keep it consistent, but it does look like the Android NDK wanted those uint64_t fields as unsigned long long. I'll upload a commit to change the Android version back.

@gnzlbg gnzlbg merged commit 5d3025b into rust-lang:master Nov 10, 2018
@gnzlbg
Copy link
Contributor

gnzlbg commented Nov 10, 2018

Thank you! And sorry for the delay! Feel free to ping me next time once CI is green!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gnzlbg gnzlbg

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@picostove @rust-highfive @gnzlbg @alexcrichton