Skip to content

[FileSystem] Allow exclusive file lock #114098

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
merged 9 commits into from
Aug 20, 2025
Merged

[FileSystem] Allow exclusive file lock #114098

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
efc7d74
[𝘀𝗽𝗿] changes to main this commit is based on
cachemeifyoucan Oct 29, 2024
541bd41
[𝘀𝗽𝗿] initial version
cachemeifyoucan Oct 29, 2024
c71d297
fix rebase
cachemeifyoucan Aug 12, 2025
0327902
address review feedback by improving test
cachemeifyoucan Aug 13, 2025
cfd422f
rebase to main
cachemeifyoucan Aug 13, 2025
5e94b4b
Merge branch 'main' into users/cachemeifyoucan/spr/filesystem-allow-e…
cachemeifyoucan Aug 14, 2025
feb2f0a
clarify the comments in test
cachemeifyoucan Aug 15, 2025
cd0f05f
address review feedback
cachemeifyoucan Aug 19, 2025
a2e3c40
fix comments
cachemeifyoucan Aug 19, 2025
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
13 changes: 9 additions & 4 deletions llvm/unittests/Support/ProgramTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,10 +583,14 @@ TEST_F(ProgramEnvTest, TestLockFileExclusive) {
int FD2;
ASSERT_NO_ERROR(fs::openFileForReadWrite(LockedFile, FD2,
fs::CD_OpenExisting, fs::OF_None));
// File should be non-exclusive locked. Try acquire exclusive lock will fail
// but non-exclusive will succeed.
EXPECT_TRUE(
fs::tryLockFile(FD2, std::chrono::seconds(0), /*Exclusive=*/true));

EXPECT_FALSE(
fs::tryLockFile(FD2, std::chrono::seconds(0), /*Exclusive=*/false));

std::error_code ErrC =
fs::tryLockFile(FD2, std::chrono::seconds(0), /*Exclusive=*/true);
EXPECT_TRUE(ErrC);
close(FD2);
// Write a file to indicate just finished.
std::string FinishFile = std::string(LockedFile) + "-finished";
Expand Down Expand Up @@ -617,7 +621,8 @@ TEST_F(ProgramEnvTest, TestLockFileExclusive) {
addEnvVar(EnvVar);

// Lock the file.
ASSERT_NO_ERROR(fs::tryLockFile(FD1));
ASSERT_NO_ERROR(fs::tryLockFile(FD1, std::chrono::seconds(0),
/*Exclusive=*/false));

std::string Error;
bool ExecutionFailed;
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.