This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1530

perftweaks: access inner map for dirstate types other than treedirstate
ClosedPublic

Authored by mbthomas on Nov 28 2017, 10:43 AM.
Tags
None
Subscribers
None

Details

Reviewers
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGXa2ff9f406890: perftweaks: access inner map for dirstate types other than treedirstate
Summary

D1410 added support for treedirstate when collecting dirstate_size for
sampling. However, it also changed from querying the inner dirstate map (which
is not available with treedirstate) to the outer map. This breaks Eden, which
prevents calls to __len__ on the outer map.

Revert the change for non-treedirstate dirstates, and handle treedirstate
explicitly.

Diff Detail

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

Event Timeline

mbthomas created this revision.Nov 28 2017, 10:43 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 28 2017, 10:43 AM
simonfar accepted this revision.Nov 28 2017, 12:05 PM
This revision is now accepted and ready to land.Nov 28 2017, 12:05 PM
Closed by commit rFBHGXa2ff9f406890: perftweaks: access inner map for dirstate types other than treedirstate (authored by mbthomas). · Explain WhyNov 28 2017, 6:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/perftweaks.py (13 lines)

Diff 3947

hgext3rd/perftweaks.py

except EnvironmentError: except EnvironmentError:
# No permission to write? No big deal # No permission to write? No big deal
pass pass
def _trackdirstatesizes(runcommand, lui, repo, *args): def _trackdirstatesizes(runcommand, lui, repo, *args):
res = runcommand(lui, repo, *args) res = runcommand(lui, repo, *args)
if repo is not None and repo.local(): if repo is not None and repo.local():
dirstate = repo.dirstate dirstate = repo.dirstate
# if the _map attribute is missing on the map, the dirstate was not if 'treedirstate' in getattr(repo, 'requirements', set()):
# loaded. # Treedirstate always has the dirstate size available.
if (('_map' in vars(dirstate) and '_map' in vars(dirstate._map)) or lui.log('dirstate_size', '', dirstate_size=len(dirstate._map))
('treedirstate' in getattr(repo, 'requirements', set()))): elif '_map' in vars(dirstate) and '_map' in vars(dirstate._map):
lui.log('dirstate_size', '', # For other dirstate types, access the inner map directly. If the
dirstate_size=len(dirstate._map)) # _map attribute is missing on the map, the dirstate was not loaded.
lui.log('dirstate_size', '', dirstate_size=len(dirstate._map._map))
return res return res
def _tracksparseprofiles(runcommand, lui, repo, *args): def _tracksparseprofiles(runcommand, lui, repo, *args):
res = runcommand(lui, repo, *args) res = runcommand(lui, repo, *args)
if repo is not None and repo.local(): if repo is not None and repo.local():
if util.safehasattr(repo, 'getactiveprofiles'): if util.safehasattr(repo, 'getactiveprofiles'):
profiles = repo.getactiveprofiles() profiles = repo.getactiveprofiles()
lui.log('sparse_profiles', '', lui.log('sparse_profiles', '',