This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8402

rust-chg: move get_umask() call out of run() function
ClosedPublic

Authored by yuja on Apr 11 2020, 7:24 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5ac5c25ea97b: rust-chg: move get_umask() call out of run() function
Summary

run() will be an async function, but get_umask() isn't thread safe.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

yuja created this revision.Apr 11 2020, 7:24 AM
Alphare accepted this revision.Apr 14 2020, 5:08 AM
yuja added a commit: rHG5ac5c25ea97b: rust-chg: move get_umask() call out of run() function.Apr 14 2020, 12:41 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5ac5c25ea97b: rust-chg: move get_umask() call out of run() function (authored by yuja). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/chg/src/main.rs (6 lines)

Diff 21037

rust/chg/src/main.rs

if env::var_os("CHGDEBUG").is_some() { if env::var_os("CHGDEBUG").is_some() {
log::set_boxed_logger(Box::new(DebugLogger::new())) log::set_boxed_logger(Box::new(DebugLogger::new()))
.expect("any logger should not be installed yet"); .expect("any logger should not be installed yet");
log::set_max_level(log::LevelFilter::Debug); log::set_max_level(log::LevelFilter::Debug);
} }
// TODO: add loop detection by $CHGINTERNALMARK // TODO: add loop detection by $CHGINTERNALMARK
let code = run().unwrap_or_else(|err| { let umask = unsafe { procutil::get_umask() }; // not thread safe
let code = run(umask).unwrap_or_else(|err| {
writeln!(io::stderr(), "chg: abort: {}", err).unwrap_or(()); writeln!(io::stderr(), "chg: abort: {}", err).unwrap_or(());
255 255
}); });
process::exit(code); process::exit(code);
} }
fn run() -> io::Result<i32> { fn run(umask: u32) -> io::Result<i32> {
let umask = unsafe { procutil::get_umask() }; // not thread safe
let mut loc = Locator::prepare_from_env()?; let mut loc = Locator::prepare_from_env()?;
loc.set_early_args(locator::collect_early_args(env::args_os().skip(1))); loc.set_early_args(locator::collect_early_args(env::args_os().skip(1)));
let handler = ChgUiHandler::new(); let handler = ChgUiHandler::new();
let (result_tx, result_rx) = oneshot::channel(); let (result_tx, result_rx) = oneshot::channel();
let fut = loc let fut = loc
.connect() .connect()
.and_then(|(_, client)| client.attach_io(io::stdin(), io::stdout(), io::stderr())) .and_then(|(_, client)| client.attach_io(io::stdin(), io::stdout(), io::stderr()))
.and_then(move |client| client.set_umask(umask)) .and_then(move |client| client.set_umask(umask))