add win interruption using tokio::windows for spk_monitor #1110
Conversation
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
doubleailes
changed the title
doubleailes
force-pushed
the
support_windows_spk_monitor
branch
3 times, most recently
from
87c2486 to
1528637
Compare
rydrman
reviewed
Sep 4, 2024
| @@ -86,11 +89,10 @@ impl CmdMonitor { | |||
| rt.block_on(self.wait_for_ready()); | |||
| // clean up this runtime and all other threads before detaching | |||
| drop(rt); | |||
|
|
|||
| #[cfg(unix)] | |||
There was a problem hiding this comment.
Is this working for you? I think the monitor still needs to be background-ed to not block the runtime from launching, no?
There was a problem hiding this comment.
I guess you mean under windows?
So far i was able to trig the commands of course with error but not depending of the runtime blocking
Comment on lines
147
to
163
| #[cfg(unix)] | ||
| let mut interrupt = signal(SignalKind::interrupt()) | ||
| .map_err(|err| Error::process_spawn_error("signal()", err, None))?; | ||
| #[cfg(windows)] | ||
| let mut interrupt = | ||
| ctrl_c().map_err(|err| Error::process_spawn_error("ctrl_c()", err, None))?; | ||
| #[cfg(unix)] | ||
| let mut quit = signal(SignalKind::quit()) | ||
| .map_err(|err| Error::process_spawn_error("signal()", err, None))?; | ||
| #[cfg(windows)] | ||
| let mut quit = ctrl_c().map_err(|err| Error::process_spawn_error("ctrl_c()", err, None))?; | ||
| #[cfg(unix)] | ||
| let mut terminate = signal(SignalKind::terminate()) | ||
| .map_err(|err| Error::process_spawn_error("signal()", err, None))?; | ||
| #[cfg(windows)] | ||
| let mut terminate = | ||
| ctrl_c().map_err(|err| Error::process_spawn_error("ctrl_c()", err, None))?; |
There was a problem hiding this comment.
To avoid all this #[cfg] maybe we can create a single future to wrap all the signals -
specifically, define a trait with a function that builds a future for all signals in one that can be implemented differently on this CmdMonitor type for each os. Let me know if my description is not clear
doubleailes
force-pushed
the
support_windows_spk_monitor
branch
from
1528637 to
5f9133f
Compare
Signed-off-by: Philippe Llerena <[email protected]>
doubleailes
force-pushed
the
support_windows_spk_monitor
branch
from
5f9133f to
09288f6
Compare
|
I switch back to draft. I need further test. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
This PR add support for Windows interruption signal using ctrl-c based on
tokio::signal::windows::ctrl_cI alternate unix/win to streamline comparaison but i can reorg to regroup by OS.