mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 05:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only call os.flock on systems that lack openat locks

Browse Source
This commit is contained in:
LeRoyce Pearson 2020-04-06 22:28:43 -06:00
parent 49886d2e45
commit 20597c8596
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/std/fs.zig
View File

@ -596,13 +596,12 @@ pub const Dir = struct {
}
// Use the O_ locking flags if the os supports them
const has_flock_open_flags = @hasDecl(os, "O_EXLOCK") and @hasDecl(os, "O_SHLOCK");
const lock_flag: u32 = lock_flag: {
if (!flags.lock) break :lock_flag 0;
if (flags.write) {
break :lock_flag if (@hasDecl(os, "O_EXLOCK")) os.O_EXLOCK else 0;
} else {
break :lock_flag if (@hasDecl(os, "O_SHLOCK")) os.O_SHLOCK else 0;
if (has_flock_open_flags and flags.lock) {
break :lock_flag if (flags.write) os.O_EXLOCK else os.O_SHLOCK;
}
break :lock_flag 0;
};
const O_LARGEFILE = if (@hasDecl(os, "O_LARGEFILE")) os.O_LARGEFILE else 0;
@ -617,7 +616,7 @@ pub const Dir = struct {
else
try os.openatZ(self.fd, sub_path, os_flags, 0);
if (flags.lock and lock_flag == 0) {
if (!has_flock_open_flags and flags.lock) {
// TODO: integrate async I/O
try os.flock(fd, if (flags.write) os.LOCK_EX else os.LOCK_SH);
}
@ -672,10 +671,8 @@ pub const Dir = struct {
}
// Use the O_ locking flags if the os supports them
const lock_flag: u32 = lock_flag: {
if (!flags.lock) break :lock_flag 0;
break :lock_flag if (@hasDecl(os, "O_EXLOCK")) os.O_EXLOCK else 0;
};
const has_flock_open_flags = @hasDecl(os, "O_EXLOCK");
const lock_flag: u32 = if (has_flock_open_flags and flags.lock) os.O_EXLOCK else 0;
const O_LARGEFILE = if (@hasDecl(os, "O_LARGEFILE")) os.O_LARGEFILE else 0;
const os_flags = lock_flag | O_LARGEFILE | os.O_CREAT | os.O_CLOEXEC |
@ -687,7 +684,7 @@ pub const Dir = struct {
else
try os.openatZ(self.fd, sub_path_c, os_flags, flags.mode);
if (flags.lock and lock_flag == 0) {
if (!has_flock_open_flags and flags.lock) {
// TODO: integrate async I/O
try os.flock(fd, os.LOCK_EX);
}