Skip to content

Commit

Permalink
implement posix_fadvise
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinwern committed Jun 23, 2019
1 parent 7fa4f23 commit e14bf1d
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
([#1069](https://github.com/nix-rust/nix/pull/1069))
- Add `mkdirat`.
([#1084](https://github.com/nix-rust/nix/pull/1084))
- Add `posix_fadvise`.
([#1089](https://github.com/nix-rust/nix/pull/1089))

### Changed
- Support for `ifaddrs` now present when building for Android.
Expand Down
42 changes: 42 additions & 0 deletions src/fcntl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ use std::ptr; // For splice and copy_file_range
#[cfg(any(target_os = "android", target_os = "linux"))]
use sys::uio::IoVec; // For vmsplice

#[cfg(any(target_os = "linux",
target_os = "android",
target_os = "emscripten",
target_os = "fuchsia",
any(target_os = "wasi", target_env = "wasi"),
target_env = "uclibc",
target_env = "freebsd"))]
pub use self::posix_fadvise::*;

libc_bitflags!{
pub struct AtFlags: c_int {
AT_SYMLINK_NOFOLLOW;
Expand Down Expand Up @@ -448,3 +457,36 @@ pub fn fallocate(fd: RawFd, mode: FallocateFlags, offset: libc::off_t, len: libc
let res = unsafe { libc::fallocate(fd, mode.bits(), offset, len) };
Errno::result(res)
}

#[cfg(any(target_os = "linux",
target_os = "android",
target_os = "emscripten",
target_os = "fuchsia",
any(target_os = "wasi", target_env = "wasi"),
target_env = "uclibc",
target_env = "freebsd"))]
mod posix_fadvise {
use Result;
use libc;
use errno::Errno;
use std::os::unix::io::RawFd;

libc_bitflags!{
pub struct PosixFadviseFlags: libc::c_int {
POSIX_FADV_NORMAL;
POSIX_FADV_SEQUENTIAL;
POSIX_FADV_RANDOM;
POSIX_FADV_NOREUSE;
POSIX_FADV_WILLNEED;
POSIX_FADV_DONTNEED;
}
}

pub fn posix_fadvise(fd: RawFd,
offset: libc::off_t,
len: libc::off_t,
advice: PosixFadviseFlags) -> Result<libc::c_int> {
let res = unsafe { libc::posix_fadvise(fd, offset, len, advice.bits()) };
Errno::result(res)
}
}
33 changes: 33 additions & 0 deletions test/test_fcntl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,36 @@ mod linux_android {
assert_eq!(100, read(fd, &mut buf).unwrap());
}
}

#[cfg(any(target_os = "linux",
target_os = "android",
target_os = "emscripten",
target_os = "fuchsia",
any(target_os = "wasi", target_env = "wasi"),
target_env = "uclibc",
target_env = "freebsd"))]
mod test_posix_fadvise {

use tempfile::NamedTempFile;
use std::os::unix::io::{RawFd, AsRawFd};
use nix::errno::Errno;
use nix::fcntl::*;
use nix::unistd::pipe;

#[test]
fn test_success() {
let tmp = NamedTempFile::new().unwrap();
let fd = tmp.as_raw_fd();
let res = posix_fadvise(fd, 0, 100, PosixFadviseFlags::POSIX_FADV_WILLNEED).unwrap();

assert_eq!(res, 0);
}

#[test]
fn test_errno() {
let (rd, _wr) = pipe().unwrap();
let errno = posix_fadvise(rd as RawFd, 0, 100, PosixFadviseFlags::POSIX_FADV_WILLNEED)
.unwrap();
assert_eq!(errno, Errno::ESPIPE as i32);
}
}

0 comments on commit e14bf1d

Please sign in to comment.