mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-09 19:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add flock command paramter to os.fcntlFlock

Browse Source 
Also, replace `os.fcntlFlockBlocking` with `os.fcntlFlock`
This commit is contained in:
LeRoyce Pearson 2020-03-09 22:57:07 -06:00
parent f66a607607
commit 4eff48b12e
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/fs.zig
View File

@ -688,7 +688,7 @@ pub const Dir = struct {
flock.l_start = 0;
flock.l_len = 0;
flock.l_pid = 0;
try os.fcntlFlockBlocking(fd, &flock);
try os.fcntlFlock(fd, .SetLockBlocking, &flock);
locked = true;
}

17
lib/std/os.zig
View File

@ -1140,9 +1140,22 @@ pub fn freeNullDelimitedEnvMap(allocator: *mem.Allocator, envp_buf: []?[*:0]u8)
allocator.free(envp_buf);
}
pub const LockCmd = enum {
GetLock,
SetLock,
SetLockBlocking,
};
/// Attempts to get lock the file, blocking if the file is locked.
pub fn fcntlFlockBlocking(fd: fd_t, flock_p: *const Flock) OpenError!void {
const rc = system.fcntl(fd, F_SETLKW, flock_p);
pub fn fcntlFlock(fd: fd_t, lock_cmd: LockCmd, flock_p: *const Flock) OpenError!void {
const cmd: i32 = cmdval: {
switch (lock_cmd) {
.GetLock => break :cmdval F_GETLK,
.SetLock => break :cmdval F_SETLK,
.SetLockBlocking => break :cmdval F_SETLKW,
}
};
const rc = system.fcntl(fd, cmd, flock_p);
if (rc < 0) {
std.debug.panic("fcntl error: {}\n", .{rc});
}