This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7610

rust-threads: force Rayon to respect the worker count in config
ClosedPublic

Authored by Alphare on Dec 12 2019, 12:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG37cbf45bb858: rust-threads: force Rayon to respect the worker count in config
Summary

As per the inline comment, this is a workaround because Rust code does not yet
know how to read config files.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Dec 12 2019, 12:37 PM
Alphare added a comment.Dec 12 2019, 12:38 PM

This entire series is a graft of existing changesets onto stable, to fix the current CI for the Rust module policy.

Alphare added a commit: rHG37cbf45bb858: rust-threads: force Rayon to respect the worker count in config.Dec 13 2019, 1:17 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG37cbf45bb858: rust-threads: force Rayon to respect the worker count in config (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (11 lines)

Diff 18688

mercurial/dirstate.py

# Rust has no ignore mechanism yet, so don't use Rust for # Rust has no ignore mechanism yet, so don't use Rust for
# commands that need ignore. # commands that need ignore.
use_rust = False use_rust = False
elif not match.always(): elif not match.always():
# Matchers have yet to be implemented # Matchers have yet to be implemented
use_rust = False use_rust = False
if use_rust: if use_rust:
# Force Rayon (Rust parallelism library) to respect the number of
# workers. This is a temporary workaround until Rust code knows
# how to read the config file.
numcpus = self._ui.configint("worker", "numcpus")
if numcpus is not None:
encoding.environ.setdefault(b'RAYON_NUM_THREADS', b'%d' % numcpus)
workers_enabled = self._ui.configbool("worker", "enabled", True)
if not workers_enabled:
encoding.environ[b"RAYON_NUM_THREADS"] = b"1"
( (
lookup, lookup,
modified, modified,
added, added,
removed, removed,
deleted, deleted,
unknown, unknown,
clean, clean,