rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Revert "use RWlock when accessing os::env #81850""

Browse Source 
This reverts commit acdca316c3.
This commit is contained in:
The8472
2021-03-14 19:10:34 +01:00
parent 9320b121b5
commit e22143c075
3 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/std/src/sys/unix/process/process_unix.rs
View File

@@ -48,7 +48,7 @@ impl Command {
// a lock any more because the parent won't do anything and the child is
// in its own process. Thus the parent drops the lock guard while the child
// forgets it to avoid unlocking it on a new thread, which would be invalid.
let (env_lock, result) = unsafe { (sys::os::env_lock(), cvt(libc::fork())?) };
let (env_lock, result) = unsafe { (sys::os::env_read_lock(), cvt(libc::fork())?) };
let pid = unsafe {
match result {
@@ -127,7 +127,7 @@ impl Command {
// Similar to when forking, we want to ensure that access to
// the environment is synchronized, so make sure to grab the
// environment lock before we try to exec.
let _lock = sys::os::env_lock();
let _lock = sys::os::env_read_lock();
let Err(e) = self.do_exec(theirs, envp.as_ref());
e
@@ -407,7 +407,7 @@ impl Command {
cvt_nz(libc::posix_spawnattr_setflags(attrs.0.as_mut_ptr(), flags as _))?;
// Make sure we synchronize access to the global `environ` resource
let _env_lock = sys::os::env_lock();
let _env_lock = sys::os::env_read_lock();
let envp = envp.map(|c| c.as_ptr()).unwrap_or_else(|| *sys::os::environ() as *const _);
cvt_nz(libc::posix_spawnp(
&mut p.pid,