Add Solaris fcntl file locking#17110
Merged
Merged
Conversation
rustbot
added
A-filesystem
Collaborator
|
r? @epage rustbot has assigned @epage. Use Why was this reviewer chosen?The reviewer was selected based on:
|
ehuss
reviewed
Jun 20, 2026
Comment on lines
+505
to
+508
| pub enum LockKind { | ||
| Exclusive, | ||
| Shared, | ||
| } |
Contributor
There was a problem hiding this comment.
Just a minor nit, is there a reason to duplicate this LockKind enum in each imp? That is, could it be lifted out?
Or, maybe a more general question, why was this added? At a glance, it seems like if each imp had the separate functions for exclusive and shared without the kind (and remove the functions in the parent module), that would simplify this and have fewer lines overall.
Contributor
Author
There was a problem hiding this comment.
Good point. I originally used LockKind to keep the Solaris fcntl path centralized, since shared and exclusive locks only differ by the raw lock type.
I simplified this now: each backend exposes explicit shared/exclusive functions, and the Solaris backend keeps only a private helper that takes the raw fcntl lock type. That removes the duplicated enum and the parent wrapper functions while keeping the behavior unchanged.
Rust std no longer provides File::lock support on Solaris because its fcntl emulation is process-scoped rather than handle-scoped. Keep Cargo's inter-process locking working on Solaris by routing Cargo's FileLock abstraction through a Solaris-specific fcntl backend. Use whole-file advisory locks for shared, exclusive, nonblocking, blocking, and unlock operations, while leaving other platforms on std::fs::File locking. Mark the same-process cache-lock tests ignored on Solaris because fcntl locks are process-scoped and those tests do not model separate Cargo processes.
psumbera
force-pushed
the
solaris-fcntl-locking
branch
from
June 22, 2026 08:05
040c704 to
5fe7a28
Compare
ehuss
approved these changes
Jun 22, 2026
ehuss
enabled auto-merge
June 22, 2026 22:55
auto-merge was automatically disabled
June 22, 2026 22:55
Pull request was closed
rustbot
removed
the
S-waiting-on-review
rustbot
added
the
S-waiting-on-review
ehuss
enabled auto-merge
June 22, 2026 22:56
weihanglo
reviewed
Jun 22, 2026
Member
There was a problem hiding this comment.
FWIW, this -Zfine-grain-locking branch also needs a patch. Not blocking though.
cargo/src/cargo/core/compiler/locking.rs
Line 88 in d3b55f8
rustbot
removed
the
S-waiting-on-review
jollaitbot
pushed a commit
to sailfishos-mirror/cargo
that referenced
this pull request
Jun 24, 2026
### What does this PR try to resolve? Address the last missing part in `-Zfine-grain-locking`: rust-lang/cargo#17110 (review) Resolves rust-lang/cargo#17084 ### How to test and review this PR? r? ehuss
rust-bors Bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Jun 27, 2026
Update cargo submodules 6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9 2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000 - fix(diag): Remove sometimes-invalid removal suggestions (rust-lang/cargo#17139) - feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106) - fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128) - fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130) - Add Solaris fcntl file locking (rust-lang/cargo#17110) - fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127) r? ghost
rust-bors Bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Jun 27, 2026
Update cargo submodules 6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9 2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000 - fix(diag): Remove sometimes-invalid removal suggestions (rust-lang/cargo#17139) - feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106) - fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128) - fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130) - Add Solaris fcntl file locking (rust-lang/cargo#17110) - fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127) r? ghost
rust-bors Bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Jun 27, 2026
Update cargo submodules 6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9 2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000 - fix(diag): Remove sometimes-invalid removal suggestions (rust-lang/cargo#17139) - feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106) - fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128) - fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130) - Add Solaris fcntl file locking (rust-lang/cargo#17110) - fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127) r? ghost
faukah
pushed a commit
to faukah/miri
that referenced
this pull request
Jun 28, 2026
Update cargo submodules 6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9 2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000 - fix(diag): Remove sometimes-invalid removal suggestions (rust-lang/cargo#17139) - feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106) - fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128) - fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130) - Add Solaris fcntl file locking (rust-lang/cargo#17110) - fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127) r? ghost
pull Bot
pushed a commit
to Kokoro2336/rust-analyzer
that referenced
this pull request
Jun 29, 2026
Update cargo submodules 6 commits in a595d0da21f228b7fdae64d3d5c0e527ea66bb59..a335d47ff8036918d3d548dabd513dc0444096a9 2026-06-20 13:42:59 +0000 to 2026-06-26 20:39:41 +0000 - fix(diag): Remove sometimes-invalid removal suggestions (rust-lang/cargo#17139) - feat: Add `-Zhint-msrv` flag (rust-lang/cargo#17106) - fix: LockManager use OS-aware flock shim (rust-lang/cargo#17128) - fix: flaky test: sparse_blocking_count (rust-lang/cargo#17130) - Add Solaris fcntl file locking (rust-lang/cargo#17110) - fix(test): skip dwp uplift test without packed debuginfo (rust-lang/cargo#17127) r? ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rust std no longer provides File::lock support on Solaris because its fcntl emulation is process-scoped rather than handle-scoped. Keep Cargo's inter-process locking working on Solaris by routing Cargo's FileLock abstraction through a Solaris-specific fcntl backend.
Use whole-file advisory locks for shared, exclusive, nonblocking, blocking, and unlock operations, while leaving other platforms on std::fs::File locking. Mark the same-process cache-lock tests ignored on Solaris because fcntl locks are process-scoped and those tests do not model separate Cargo processes.