-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
signal: add SignalKind::info on illumos #6995
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
#![warn(rust_2018_idioms)] | ||
#![cfg(feature = "full")] | ||
#![cfg(any( | ||
target_os = "dragonfly", | ||
target_os = "freebsd", | ||
target_os = "macos", | ||
target_os = "netbsd", | ||
target_os = "openbsd", | ||
target_os = "illumos" | ||
))] | ||
#![cfg(not(miri))] // No `sigaction` on Miri | ||
|
||
mod support { | ||
pub mod signal; | ||
} | ||
use support::signal::send_signal; | ||
|
||
use tokio::signal; | ||
use tokio::signal::unix::SignalKind; | ||
use tokio::sync::oneshot; | ||
use tokio::time::{timeout, Duration}; | ||
|
||
#[tokio::test] | ||
async fn siginfo() { | ||
let mut sig = signal::unix::signal(SignalKind::info()).expect("installed signal handler"); | ||
|
||
let (fire, wait) = oneshot::channel(); | ||
|
||
// NB: simulate a signal coming in by exercising our signal handler | ||
// to avoid complications with sending SIGINFO to the test process | ||
tokio::spawn(async { | ||
wait.await.expect("wait failed"); | ||
send_signal(libc::SIGINFO); | ||
}); | ||
|
||
let _ = fire.send(()); | ||
|
||
// Add a timeout to ensure the test doesn't hang. | ||
timeout(Duration::from_secs(5), sig.recv()) | ||
.await | ||
.expect("received SIGINFO signal in time") | ||
.expect("received SIGINFO signal"); | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The oneshot channel changes nothing. Tests use the single-threaded runtime, so this spawned task is going to run on this thread, and it will not run until the main test task yields, which it does after polling
sig.recv()
once.Was that the intent of this code?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I copied this from the other tests, specifically:
tokio/tokio/tests/signal_ctrl_c.rs
Lines 19 to 26 in c032ea0
I agree that it doesn't make a difference in the narrow case of a single-threaded runtime.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would you like to keep the oneshot channel, have me remove it from this test, or do it yourself across all the signal tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Filed #7015.