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

use rwlock for accessing ENV

Browse Source
This commit is contained in:
The8472
2021-02-06 22:38:16 +01:00
parent cfba499271
commit 55ca27faa7
3 changed files with 55 additions and 11 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

@@ -47,7 +47,7 @@ impl Command {
// a lock any more because the parent won't do anything and the child is
// in its own process.
let result = unsafe {
let _env_lock = sys::os::env_lock();
let _env_lock = sys::os::env_rwlock(true);
cvt(libc::fork())?
};
@@ -124,7 +124,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_rwlock(true);
let Err(e) = self.do_exec(theirs, envp.as_ref());
e
@@ -404,7 +404,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_rwlock(true);
let envp = envp.map(|c| c.as_ptr()).unwrap_or_else(|| *sys::os::environ() as *const _);
cvt_nz(libc::posix_spawnp(
&mut p.pid,