mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 10:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sys_util: do not treat EINTR as negative in handle_eintr

Browse source 
System error codes are positive, we should not try to use the negative
(kernel) form when working with it.

TEST=cargo test --features plugin; cargo test -p sys_util
BUG=None

Change-Id: I8dea773e6148d1814ca0ea5019d5fb7824dc80ac
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/940611
Reviewed-by: Zach Reizner <zachr@chromium.org>
This commit is contained in:
Dmitry Torokhov 2018-02-27 16:41:52 -08:00 committed by chrome-bot
parent 8b32d55ae2
commit 3cbbbe6884
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys_util/src/handle_eintr.rs
View file

@ -17,14 +17,14 @@ pub trait InterruptibleResult {
impl InterruptibleResult for i32 {
fn is_interrupted(&self) -> bool {
*self == -EINTR
*self == EINTR
}
}
impl<T> InterruptibleResult for ::Result<T> {
fn is_interrupted(&self) -> bool {
match self {
&Err(e) if e.errno() == -EINTR => true,
&Err(e) if e.errno() == EINTR => true,
_ => false,
}
}
@ -45,8 +45,8 @@ impl<T> InterruptibleResult for io::Result<T> {
///
/// The given expression `$x` can return
///
/// * `i32` in which case the expression is retried if equal to `-EINTR`.
/// * `sys_util::Result` in which case the expression is retried if the `Error::errno()` is `-EINTR`.
/// * `i32` in which case the expression is retried if equal to `EINTR`.
/// * `sys_util::Result` in which case the expression is retried if the `Error::errno()` is `EINTR`.
/// * `std::io::Result` in which case the expression is retried if the `ErrorKind` is `ErrorKind::Interrupted`.
///
/// In all cases where the result does not indicate that the expression was interrupted, the result
@ -155,10 +155,10 @@ mod tests {
{
let mut dummy = || {
count -= 1;
if count > 0 { -EINTR } else { 56 }
if count > 0 { EINTR } else { 0 }
};
let res = handle_eintr!(dummy());
assert_eq!(res, 56);
assert_eq!(res, 0);
}
assert_eq!(count, 0);
}
@ -170,7 +170,7 @@ mod tests {
let mut dummy = || {
count -= 1;
if count > 1 {
Err(SysError::new(-EINTR))
Err(SysError::new(EINTR))
} else {
Ok(101)
}