Replace fcntl-based file lock with flock
WSL1 does not support `fcntl`-based lock and will always report success, therefore creating a race condition when multiple rustc processes are modifying shared data such as `search-index.js`. WSL1 does however support `flock`. `flock` is supported by all unix-like platforms. The only caveat is that Linux 2.6.11 or earlier does not support `flock` on NFS mounts, but as the minimum supported Linux version is 2.6.18, it is not an issue. Fixes #72157
This commit is contained in:
parent
769d12eec1
commit
a23dd0d1e6
1 changed files with 19 additions and 48 deletions
|
@ -12,13 +12,12 @@ use std::path::Path;
|
||||||
|
|
||||||
cfg_if! {
|
cfg_if! {
|
||||||
if #[cfg(unix)] {
|
if #[cfg(unix)] {
|
||||||
use std::ffi::{CString, OsStr};
|
|
||||||
use std::mem;
|
|
||||||
use std::os::unix::prelude::*;
|
use std::os::unix::prelude::*;
|
||||||
|
use std::fs::{File, OpenOptions};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Lock {
|
pub struct Lock {
|
||||||
fd: libc::c_int,
|
_file: File,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Lock {
|
impl Lock {
|
||||||
|
@ -27,63 +26,35 @@ cfg_if! {
|
||||||
create: bool,
|
create: bool,
|
||||||
exclusive: bool)
|
exclusive: bool)
|
||||||
-> io::Result<Lock> {
|
-> io::Result<Lock> {
|
||||||
let os: &OsStr = p.as_ref();
|
let file = OpenOptions::new()
|
||||||
let buf = CString::new(os.as_bytes()).unwrap();
|
.read(true)
|
||||||
let open_flags = if create {
|
.write(true)
|
||||||
libc::O_RDWR | libc::O_CREAT
|
.create(create)
|
||||||
|
.mode(libc::S_IRWXU as u32)
|
||||||
|
.open(p)?;
|
||||||
|
|
||||||
|
let mut operation = if exclusive {
|
||||||
|
libc::LOCK_EX
|
||||||
} else {
|
} else {
|
||||||
libc::O_RDWR
|
libc::LOCK_SH
|
||||||
};
|
};
|
||||||
|
if !wait {
|
||||||
let fd = unsafe {
|
operation |= libc::LOCK_NB
|
||||||
libc::open(buf.as_ptr(), open_flags,
|
|
||||||
libc::S_IRWXU as libc::c_int)
|
|
||||||
};
|
|
||||||
|
|
||||||
if fd < 0 {
|
|
||||||
return Err(io::Error::last_os_error());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let lock_type = if exclusive {
|
let ret = unsafe { libc::flock(file.as_raw_fd(), operation) };
|
||||||
libc::F_WRLCK
|
|
||||||
} else {
|
|
||||||
libc::F_RDLCK
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut flock: libc::flock = unsafe { mem::zeroed() };
|
|
||||||
flock.l_type = lock_type as libc::c_short;
|
|
||||||
flock.l_whence = libc::SEEK_SET as libc::c_short;
|
|
||||||
flock.l_start = 0;
|
|
||||||
flock.l_len = 0;
|
|
||||||
|
|
||||||
let cmd = if wait { libc::F_SETLKW } else { libc::F_SETLK };
|
|
||||||
let ret = unsafe {
|
|
||||||
libc::fcntl(fd, cmd, &flock)
|
|
||||||
};
|
|
||||||
if ret == -1 {
|
if ret == -1 {
|
||||||
let err = io::Error::last_os_error();
|
let err = io::Error::last_os_error();
|
||||||
unsafe { libc::close(fd); }
|
|
||||||
Err(err)
|
Err(err)
|
||||||
} else {
|
} else {
|
||||||
Ok(Lock { fd })
|
Ok(Lock { _file: file })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Drop for Lock {
|
// Note that we don't need a Drop impl to execute `flock(fd, LOCK_UN)`. Lock acquired by
|
||||||
fn drop(&mut self) {
|
// `flock` is associated with the file descriptor and closing the file release it
|
||||||
let mut flock: libc::flock = unsafe { mem::zeroed() };
|
// automatically.
|
||||||
flock.l_type = libc::F_UNLCK as libc::c_short;
|
|
||||||
flock.l_whence = libc::SEEK_SET as libc::c_short;
|
|
||||||
flock.l_start = 0;
|
|
||||||
flock.l_len = 0;
|
|
||||||
|
|
||||||
unsafe {
|
|
||||||
libc::fcntl(self.fd, libc::F_SETLK, &flock);
|
|
||||||
libc::close(self.fd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if #[cfg(windows)] {
|
} else if #[cfg(windows)] {
|
||||||
use std::mem;
|
use std::mem;
|
||||||
use std::os::windows::prelude::*;
|
use std::os::windows::prelude::*;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue