Skip to content

kmc-solid: Fix is_interrupted #115427

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 2, 2023
Merged

kmc-solid: Fix is_interrupted #115427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc37959
kmc-solid: Directly delegate to `net::is_interrupted` in `std::sys::s…
kawadakk Sep 1, 2023
eb627ea
kmc-solid: Refactor `is_interrupted` to avoid integer overflow
kawadakk Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions library/std/src/sys/solid/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ pub fn error_name(er: abi::ER) -> Option<&'static str> {
}
}

#[inline]
fn is_interrupted(er: abi::ER) -> bool {
false
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
match er {
// Success
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/sys/solid/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub fn unsupported_err() -> crate::io::Error {

#[inline]
pub fn is_interrupted(code: i32) -> bool {
error::is_interrupted(code)
net::is_interrupted(code)
}

pub fn decode_error_kind(code: i32) -> crate::io::ErrorKind {
Expand Down
3 changes: 1 addition & 2 deletions library/std/src/sys/solid/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,7 @@ pub(super) fn error_name(er: abi::ER) -> Option<&'static str> {

#[inline]
pub fn is_interrupted(er: abi::ER) -> bool {
let errno = netc::SOLID_NET_ERR_BASE - er;
errno as libc::c_int == libc::EINTR
er == netc::SOLID_NET_ERR_BASE - libc::EINTR
}

pub(super) fn decode_error_kind(er: abi::ER) -> ErrorKind {
Expand Down