OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #16964 : nodakai/rust/libnative-superfluous-retry, r=alexcrichton 

Those syscalls listed below don't return `EINTR`, so wrapping them with `retry()` is superfluous.

But I admit the current code is better from the viewpoint of difensive programming, given that the overhead of `retry()` is really cheap...

http://pubs.opengroup.org/onlinepubs/9699919799/functions/fstat.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/mkdir.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/unlink.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/rmdir.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/symlink.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/link.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/fstatat.html
http://pubs.opengroup.org/onlinepubs/9699919799/functions/utime.html
This commit is contained in:
bors 2014-09-04 09:21:04 +00:00
parent 5924937a5a d90921a9d8
commit 85e2e5a900
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/libnative/io/file_unix.rs
View File

@ -154,7 +154,7 @@ impl rtio::RtioFileStream for FileDesc {
fn fstat(&mut self) -> IoResult<rtio::FileStat> { fn fstat(&mut self) -> IoResult<rtio::FileStat> {
let mut stat: libc::stat = unsafe { mem::zeroed() }; let mut stat: libc::stat = unsafe { mem::zeroed() };
match retry(|| unsafe { libc::fstat(self.fd(), &mut stat) }) { match unsafe { libc::fstat(self.fd(), &mut stat) } {
0 => Ok(mkstat(&stat)), 0 => Ok(mkstat(&stat)),
_ => Err(super::last_error()), _ => Err(super::last_error()),
} }
@ -346,9 +346,7 @@ pub fn open(path: &CString, fm: rtio::FileMode, fa: rtio::FileAccess)
} }
pub fn mkdir(p: &CString, mode: uint) -> IoResult<()> { pub fn mkdir(p: &CString, mode: uint) -> IoResult<()> {
super::mkerr_libc(retry(|| unsafe { super::mkerr_libc(unsafe { libc::mkdir(p.as_ptr(), mode as libc::mode_t) })
libc::mkdir(p.as_ptr(), mode as libc::mode_t)
}))
} }
pub fn readdir(p: &CString) -> IoResult<Vec<CString>> { pub fn readdir(p: &CString) -> IoResult<Vec<CString>> {
@ -393,13 +391,11 @@ pub fn readdir(p: &CString) -> IoResult<Vec<CString>> {
} }
pub fn unlink(p: &CString) -> IoResult<()> { pub fn unlink(p: &CString) -> IoResult<()> {
super::mkerr_libc(retry(|| unsafe { libc::unlink(p.as_ptr()) })) super::mkerr_libc(unsafe { libc::unlink(p.as_ptr()) })
} }
pub fn rename(old: &CString, new: &CString) -> IoResult<()> { pub fn rename(old: &CString, new: &CString) -> IoResult<()> {
super::mkerr_libc(retry(|| unsafe { super::mkerr_libc(unsafe { libc::rename(old.as_ptr(), new.as_ptr()) })
libc::rename(old.as_ptr(), new.as_ptr())
}))
} }
pub fn chmod(p: &CString, mode: uint) -> IoResult<()> { pub fn chmod(p: &CString, mode: uint) -> IoResult<()> {
@ -409,9 +405,7 @@ pub fn chmod(p: &CString, mode: uint) -> IoResult<()> {
} }
pub fn rmdir(p: &CString) -> IoResult<()> { pub fn rmdir(p: &CString) -> IoResult<()> {
super::mkerr_libc(retry(|| unsafe { super::mkerr_libc(unsafe { libc::rmdir(p.as_ptr()) })
libc::rmdir(p.as_ptr())
}))
} }
pub fn chown(p: &CString, uid: int, gid: int) -> IoResult<()> { pub fn chown(p: &CString, uid: int, gid: int) -> IoResult<()> {
@ -428,10 +422,10 @@ pub fn readlink(p: &CString) -> IoResult<CString> {
len = 1024; // FIXME: read PATH_MAX from C ffi? len = 1024; // FIXME: read PATH_MAX from C ffi?
} }
let mut buf: Vec<u8> = Vec::with_capacity(len as uint); let mut buf: Vec<u8> = Vec::with_capacity(len as uint);
match retry(|| unsafe { match unsafe {
libc::readlink(p, buf.as_ptr() as *mut libc::c_char, libc::readlink(p, buf.as_ptr() as *mut libc::c_char,
len as libc::size_t) as libc::c_int len as libc::size_t) as libc::c_int
}) { } {
-1 => Err(super::last_error()), -1 => Err(super::last_error()),
n => { n => {
assert!(n > 0); assert!(n > 0);
@ -442,15 +436,11 @@ pub fn readlink(p: &CString) -> IoResult<CString> {
} }
pub fn symlink(src: &CString, dst: &CString) -> IoResult<()> { pub fn symlink(src: &CString, dst: &CString) -> IoResult<()> {
super::mkerr_libc(retry(|| unsafe { super::mkerr_libc(unsafe { libc::symlink(src.as_ptr(), dst.as_ptr()) })
libc::symlink(src.as_ptr(), dst.as_ptr())
}))
} }
pub fn link(src: &CString, dst: &CString) -> IoResult<()> { pub fn link(src: &CString, dst: &CString) -> IoResult<()> {
super::mkerr_libc(retry(|| unsafe { super::mkerr_libc(unsafe { libc::link(src.as_ptr(), dst.as_ptr()) })
libc::link(src.as_ptr(), dst.as_ptr())
}))
} }
fn mkstat(stat: &libc::stat) -> rtio::FileStat { fn mkstat(stat: &libc::stat) -> rtio::FileStat {
@ -489,7 +479,7 @@ fn mkstat(stat: &libc::stat) -> rtio::FileStat {
pub fn stat(p: &CString) -> IoResult<rtio::FileStat> { pub fn stat(p: &CString) -> IoResult<rtio::FileStat> {
let mut stat: libc::stat = unsafe { mem::zeroed() }; let mut stat: libc::stat = unsafe { mem::zeroed() };
match retry(|| unsafe { libc::stat(p.as_ptr(), &mut stat) }) { match unsafe { libc::stat(p.as_ptr(), &mut stat) } {
0 => Ok(mkstat(&stat)), 0 => Ok(mkstat(&stat)),
_ => Err(super::last_error()), _ => Err(super::last_error()),
} }
@ -497,7 +487,7 @@ pub fn stat(p: &CString) -> IoResult<rtio::FileStat> {
pub fn lstat(p: &CString) -> IoResult<rtio::FileStat> { pub fn lstat(p: &CString) -> IoResult<rtio::FileStat> {
let mut stat: libc::stat = unsafe { mem::zeroed() }; let mut stat: libc::stat = unsafe { mem::zeroed() };
match retry(|| unsafe { libc::lstat(p.as_ptr(), &mut stat) }) { match unsafe { libc::lstat(p.as_ptr(), &mut stat) } {
0 => Ok(mkstat(&stat)), 0 => Ok(mkstat(&stat)),
_ => Err(super::last_error()), _ => Err(super::last_error()),
} }
@ -508,9 +498,7 @@ pub fn utime(p: &CString, atime: u64, mtime: u64) -> IoResult<()> {
actime: (atime / 1000) as libc::time_t, actime: (atime / 1000) as libc::time_t,
modtime: (mtime / 1000) as libc::time_t, modtime: (mtime / 1000) as libc::time_t,
}; };
super::mkerr_libc(retry(|| unsafe { super::mkerr_libc(unsafe { libc::utime(p.as_ptr(), &buf) })
libc::utime(p.as_ptr(), &buf)
}))
} }
#[cfg(test)] #[cfg(test)]