Don't unnecessarily change SIGPIPE disposition in unix_sigpipe tests
#121554
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In `auxiliary/sigpipe-utils.rs`, all we want to know is the current `SIGPIPE` disposition. We should not change it. So use `libc::sigaction` instead of `libc::signal`. That way we can also remove the code that restores it.
rustbot
added
S-waiting-on-review
Enselic
changed the title
SIGPIPE disposition in unix_sigpipe testsSIGPIPE disposition in unix_sigpipe tests
|
r? compiler |
oli-obk
reviewed
Feb 26, 2024
| @@ -17,17 +17,17 @@ pub fn assert_sigpipe_handler(expected_handler: SignalHandler) { | |||
| target_os = "android", | |||
| )))] | |||
| { | |||
| let prev = unsafe { libc::signal(libc::SIGPIPE, libc::SIG_IGN) }; | |||
| let actual = unsafe { | |||
| let mut actual: libc::sigaction = std::mem::zeroed(); | |||
There was a problem hiding this comment.
sad that libc doesn't have a good way to init this, can't even do it fully safely manually, because some fields have private fields :(
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 26, 2024
…llaumeGomez Rollup of 5 pull requests Successful merges: - rust-lang#120656 (Allow tests to specify a `//@ filecheck-flags:` header) - rust-lang#120840 (Split Diagnostics for Uncommon Codepoints: Add Individual Identifier Types) - rust-lang#121554 (Don't unnecessarily change `SIGPIPE` disposition in `unix_sigpipe` tests) - rust-lang#121590 (Correctly handle if rustdoc JS script hash changed) - rust-lang#121620 (Fix more rust-lang#121208 fallout (round 3)) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 26, 2024
Rollup merge of rust-lang#121554 - Enselic:sigaction, r=oli-obk Don't unnecessarily change `SIGPIPE` disposition in `unix_sigpipe` tests In `auxiliary/sigpipe-utils.rs`, all we want to know is the current `SIGPIPE` disposition. We should not change it. So use `libc::sigaction` instead of `libc::signal`. That way we can also remove the code that restores it. Part of rust-lang#97889.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
auxiliary/sigpipe-utils.rs, all we want to know is the currentSIGPIPEdisposition. We should not change it. So uselibc::sigactioninstead oflibc::signal. That way we can also remove the code that restores it.Part of #97889.