This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7310

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

Authored by Alphare on Nov 8 2019, 4:09 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG47fac1692ede: rust-threads: force Rayon to respect the worker count in config
rHG57384e8e1fb6: 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.Nov 8 2019, 4:09 AM
martinvonz requested changes to this revision.Nov 8 2019, 8:40 AM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
mercurial/dirstate.py
1118

Is is the pycompat call needed? Same below.

This revision now requires changes to proceed.Nov 8 2019, 8:40 AM
Alphare added a comment.Nov 8 2019, 9:13 AM

You're right, it shouldn't

Alphare updated this revision to Diff 17749.Nov 8 2019, 9:15 AM
Alphare added a commit: rHG57384e8e1fb6: rust-threads: force Rayon to respect the worker count in config.Nov 8 2019, 1:33 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG57384e8e1fb6: 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.
mharbison72 added a subscriber: mharbison72.Dec 13 2019, 11:54 AM
mharbison72 added inline comments.
mercurial/dirstate.py
1119

Isn't the default parameter usually omitted, and picked up from the registrar?

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (11 lines)

Diff 17796

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:
os.environ.setdefault('RAYON_NUM_THREADS', str(numcpus))
martinvonzUnsubmitted
Not Done

Is is the pycompat call needed? Same below.

martinvonz: Is is the pycompat call needed? Same below.
workers_enabled = self._ui.configbool("worker", "enabled", True)
mharbison72Unsubmitted
Not Done

Isn't the default parameter usually omitted, and picked up from the registrar?

mharbison72: Isn't the default parameter usually omitted, and picked up from the registrar?
if not workers_enabled:
os.environ["RAYON_NUM_THREADS"] = "1"
( (
lookup, lookup,
modified, modified,
added, added,
removed, removed,
deleted, deleted,
unknown, unknown,
clean, clean,