Skip to content
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

Jump to bottom

Implement open file descriptor locks in fcntl #1195

Merged
merged 14 commits into from Apr 8, 2020
Merged

Implement open file descriptor locks in fcntl #1195

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
08be41e
Update libc to 0.2.68
andrenth Mar 17, 2020
360bdfb
Handle open file descriptor locks in fcntl
andrenth Mar 17, 2020
b56fb4c
Update CHANGELOG
andrenth Mar 17, 2020
2ae45b8
Add fcntl tests for OFD locks
andrenth Mar 18, 2020
8252142
Try to get tests working on 32 bits
andrenth Mar 18, 2020
ef01f46
Add missing libc::flock fields in mips
andrenth Mar 18, 2020
6075ce0
Fix type of pad field
andrenth Mar 18, 2020
87f33c3
Don't test on mips; replace unwrap for expect
andrenth Mar 18, 2020
2d90033
Exclude targets failing on CI
andrenth Mar 19, 2020
3332c08
One more arch exclusion
andrenth Mar 19, 2020
1478315
Undo rustfmt reformating
andrenth Mar 27, 2020
4c4df3c
Explain why OFD tests are disabled in some archs
andrenth Mar 27, 2020
5e2d14b
i686 -> x86
andrenth Mar 27, 2020
f7f1d09
Split read and write OFD lock tests
andrenth Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ exclude = [
]

[dependencies]
libc = { version = "0.2.60", features = [ "extra_traits" ] }
libc = { version = "0.2.68", features = [ "extra_traits" ] }
bitflags = "1.1"
cfg-if = "0.1.10"
void = "1.0.2"
Expand Down
8 changes: 6 additions & 2 deletions src/fcntl.rs
View file
Open in desktop
Expand Up @@ -286,6 +286,12 @@ pub fn fcntl(fd: RawFd, arg: FcntlArg) -> Result<c_int> {
F_SETLKW(flock) => libc::fcntl(fd, libc::F_SETLKW, flock),
F_GETLK(flock) => libc::fcntl(fd, libc::F_GETLK, flock),
#[cfg(any(target_os = "android", target_os = "linux"))]
F_OFD_SETLK(flock) => libc::fcntl(fd, libc::F_OFD_SETLK, flock),
#[cfg(any(target_os = "android", target_os = "linux"))]
F_OFD_SETLKW(flock) => libc::fcntl(fd, libc::F_OFD_SETLKW, flock),
#[cfg(any(target_os = "android", target_os = "linux"))]
F_OFD_GETLK(flock) => libc::fcntl(fd, libc::F_OFD_GETLK, flock),
#[cfg(any(target_os = "android", target_os = "linux"))]
F_ADD_SEALS(flag) => libc::fcntl(fd, libc::F_ADD_SEALS, flag.bits()),
#[cfg(any(target_os = "android", target_os = "linux"))]
F_GET_SEALS => libc::fcntl(fd, libc::F_GET_SEALS),
Expand All @@ -295,8 +301,6 @@ pub fn fcntl(fd: RawFd, arg: FcntlArg) -> Result<c_int> {
F_GETPIPE_SZ => libc::fcntl(fd, libc::F_GETPIPE_SZ),
#[cfg(any(target_os = "linux", target_os = "android"))]
F_SETPIPE_SZ(size) => libc::fcntl(fd, libc::F_SETPIPE_SZ, size),
#[cfg(any(target_os = "linux", target_os = "android"))]
_ => unimplemented!()
}
};

Expand Down