Replace launcher's Process struct's unsafe implementations with rust stdlib #5733
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
…stdlib Now that try and try_wait exist, Process can be a thin wrapper around std::process::Child on unix. Unfortunately, the same isn't currently feasible on Windows, since the process spawning depends on additional features not available in the rust stdlib currently. Also, fix some typos. Resolves #5361 Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com>
baumanj
requested review from
christophermaier,
raskchanky and
reset
as code owners
|
Thanks for the pull request! Here is what will happen next:
Thank you for contributing! |
baumanj
commented
Oct 10, 2018
| pub use sys::service::*; | ||
|
|
||
| pub struct Service { | ||
| args: protocol::Spawn, | ||
| process: Process, | ||
| status: Option<ExitStatus>, |
There was a problem hiding this comment.
Note this field was never mutated, so removing it should be safe
baumanj
commented
Oct 10, 2018
| @@ -25,7 +24,7 @@ impl Handler for RestartHandler { | |||
| type Reply = protocol::SpawnOk; | |||
|
|
|||
| fn handle(msg: Self::Message, services: &mut ServiceTable) -> HandleResult<Self::Reply> { | |||
| let mut service = match services.remove(msg.get_pid() as Pid) { | |||
| let mut service = match services.remove(msg.get_pid() as u32) { | |||
There was a problem hiding this comment.
I like descriptive types as much as the next person, but std::process::Child::id() returns a u32, so I think it's preferable to align with the stdlib. This ripples out in a number of places, but also requires some casts since certain libc calls take i32.
baumanj
commented
Oct 10, 2018
| } | ||
| } | ||
| pub fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> { | ||
| self.0.try_wait() |
There was a problem hiding this comment.
As you can see the stdlib implementation is nearly identical.
baumanj
commented
Oct 10, 2018
| } | ||
| } | ||
| pub fn wait(&mut self) -> io::Result<ExitStatus> { | ||
| self.0.wait() |
There was a problem hiding this comment.
Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com>
And only include use libc for unix to avoid warning Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com>
Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com>
chef-ci
added a commit
that referenced
this pull request
Oct 11, 2018
Obvious fix; these changes are the result of automation not creative thinking.
christophermaier
added
Type:BugFixes
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.
Now that try and try_wait exist, Process can be a thin wrapper around
std::process::Child on unix. Unfortunately, the same isn't currently feasible
on Windows, since the process spawning depends on additional features not
available in the rust stdlib currently.
Also, fix some typos.
Resolves #5361