Skip to content

fcntl_lock should be supported on Solaris #1226

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
sunfishcode merged 1 commit into from
Dec 8, 2024
Merged

fcntl_lock should be supported on Solaris #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions src/backend/libc/fs/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ use crate::fs::AtFlags;
target_os = "vita",
)))]
use crate::fs::FallocateFlags;
#[cfg(not(any(
target_os = "espidf",
target_os = "solaris",
target_os = "vita",
target_os = "wasi"
)))]
#[cfg(not(any(target_os = "espidf", target_os = "vita", target_os = "wasi")))]
use crate::fs::FlockOperation;
#[cfg(any(linux_kernel, target_os = "freebsd"))]
use crate::fs::MemfdFlags;
Expand Down Expand Up @@ -1257,7 +1252,6 @@ pub(crate) fn fcntl_add_seals(fd: BorrowedFd<'_>, seals: SealFlags) -> io::Resul
target_os = "espidf",
target_os = "fuchsia",
target_os = "redox",
target_os = "solaris",
target_os = "vita",
target_os = "wasi"
)))]
Expand Down
34 changes: 28 additions & 6 deletions src/backend/libc/fs/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,27 +949,49 @@ bitflags! {
///
/// [`flock`]: crate::fs::flock
/// [`fcntl_lock`]: crate::fs::fcntl_lock
#[cfg(not(any(
target_os = "espidf",
target_os = "solaris",
target_os = "vita",
target_os = "wasi"
)))]
// Solaris doesn't support `flock` and doesn't define `LOCK_SH` etc., but we
// reuse this `FlockOperation` enum for `fcntl_lock`, so on Solaris we use
// our own made-up integer values.
#[cfg(not(any(target_os = "espidf", target_os = "vita", target_os = "wasi")))]
Copy link
Copy Markdown
Member

@sunfishcode sunfishcode Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#[cfg(not(any(target_os = "espidf", target_os = "vita", target_os = "wasi")))]
// Solaris doesn't support `flock` and doesn't define `LOCK_SH` etc., but we
// reuse this `FlockOperation` enum for `fcntl_lock`, so on Solaris we use
// our own made-up integer values.
#[cfg(not(any(target_os = "espidf", target_os = "vita", target_os = "wasi")))]

#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[repr(u32)]
pub enum FlockOperation {
/// `LOCK_SH`
#[cfg(not(target_os = "solaris"))]
LockShared = bitcast!(c::LOCK_SH),
/// `LOCK_SH`
#[cfg(target_os = "solaris")]
LockShared = bitcast!(1),
/// `LOCK_EX`
#[cfg(not(target_os = "solaris"))]
LockExclusive = bitcast!(c::LOCK_EX),
/// `LOCK_EX`
#[cfg(target_os = "solaris")]
LockExclusive = bitcast!(2),
/// `LOCK_UN`
#[cfg(not(target_os = "solaris"))]
Unlock = bitcast!(c::LOCK_UN),
/// `LOCK_UN`
#[cfg(target_os = "solaris")]
Unlock = bitcast!(8),
/// `LOCK_SH | LOCK_NB`
#[cfg(not(target_os = "solaris"))]
NonBlockingLockShared = bitcast!(c::LOCK_SH | c::LOCK_NB),
/// `LOCK_SH | LOCK_NB`
#[cfg(target_os = "solaris")]
NonBlockingLockShared = bitcast!(1 | 4),
/// `LOCK_EX | LOCK_NB`
#[cfg(not(target_os = "solaris"))]
NonBlockingLockExclusive = bitcast!(c::LOCK_EX | c::LOCK_NB),
/// `LOCK_EX | LOCK_NB`
#[cfg(target_os = "solaris")]
NonBlockingLockExclusive = bitcast!(2 | 4),
/// `LOCK_UN | LOCK_NB`
#[cfg(not(target_os = "solaris"))]
NonBlockingUnlock = bitcast!(c::LOCK_UN | c::LOCK_NB),
/// `LOCK_UN | LOCK_NB`
#[cfg(target_os = "solaris")]
NonBlockingUnlock = bitcast!(8 | 4),
}

/// `struct stat` for use with [`statat`] and [`fstat`].
Expand Down
2 changes: 0 additions & 2 deletions src/fs/fcntl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
target_os = "espidf",
target_os = "fuchsia",
target_os = "redox",
target_os = "solaris",
target_os = "vita",
target_os = "wasi"
)))]
Expand Down Expand Up @@ -102,7 +101,6 @@ pub fn fcntl_add_seals<Fd: AsFd>(fd: Fd, seals: SealFlags) -> io::Result<()> {
target_os = "espidf",
target_os = "fuchsia",
target_os = "redox",
target_os = "solaris",
target_os = "vita",
target_os = "wasi"
)))]
Expand Down