util: teach lrucachedict to enforce a max total cost
Now that lrucachedict entries can have a numeric cost associated
with them and we can easily pop the oldest item in the cache, it
now becomes relatively trivial to implement support for enforcing
a high water mark on the total cost of items in the cache.
This commit teaches lrucachedict instances to have a max cost
associated with them. When items are inserted, we pop old items
until enough "cost" frees up to make room for the new item.
This feature is close to zero cost when not used (modulo the insertion
regressed introduced by the previous commit):
$ ./hg perflrucachedict --size 4 --gets 1000000 --sets 1000000 --mixed 1000000
! gets
! wall 0.607444 comb 0.610000 user 0.610000 sys 0.000000 (best of 17)
! wall 0.601653 comb 0.600000 user 0.600000 sys 0.000000 (best of 17)
! inserts
! wall 0.678261 comb 0.680000 user 0.680000 sys 0.000000 (best of 14)
! wall 0.685042 comb 0.680000 user 0.680000 sys 0.000000 (best of 15)
! sets
! wall 0.808770 comb 0.800000 user 0.800000 sys 0.000000 (best of 13)
! wall 0.834241 comb 0.830000 user 0.830000 sys 0.000000 (best of 12)
! mixed
! wall 0.782441 comb 0.780000 user 0.780000 sys 0.000000 (best of 13)
! wall 0.803804 comb 0.800000 user 0.800000 sys 0.000000 (best of 13)
$ hg perflrucachedict --size 1000 --gets 1000000 --sets 1000000 --mixed 1000000
! init
! wall 0.006952 comb 0.010000 user 0.010000 sys 0.000000 (best of 418)
! gets
! wall 0.613350 comb 0.610000 user 0.610000 sys 0.000000 (best of 17)
! wall 0.617415 comb 0.620000 user 0.620000 sys 0.000000 (best of 17)
! inserts
! wall 0.701270 comb 0.700000 user 0.700000 sys 0.000000 (best of 15)
! wall 0.700516 comb 0.700000 user 0.700000 sys 0.000000 (best of 15)
! sets
! wall 0.825720 comb 0.830000 user 0.830000 sys 0.000000 (best of 13)
! wall 0.837946 comb 0.840000 user 0.830000 sys 0.010000 (best of 12)
! mixed
! wall 0.821644 comb 0.820000 user 0.820000 sys 0.000000 (best of 13)
! wall 0.850559 comb 0.850000 user 0.850000 sys 0.000000 (best of 12)
I reckon the slight slowdown on insert is due to added if checks.
For caches with total cost limiting enabled:
$ hg perflrucachedict --size 4 --gets 1000000 --sets 1000000 --mixed 1000000 --costlimit 100
! gets w/ cost limit
! wall 0.598737 comb 0.590000 user 0.590000 sys 0.000000 (best of 17)
! inserts w/ cost limit
! wall 1.694282 comb 1.700000 user 1.700000 sys 0.000000 (best of 6)
! mixed w/ cost limit
! wall 1.157655 comb 1.150000 user 1.150000 sys 0.000000 (best of 9)
$ hg perflrucachedict --size 1000 --gets 1000000 --sets 1000000 --mixed 1000000 --costlimit 10000
! gets w/ cost limit
! wall 0.598526 comb 0.600000 user 0.600000 sys 0.000000 (best of 17)
! inserts w/ cost limit
! wall 37.838315 comb 37.840000 user 37.840000 sys 0.000000 (best of 3)
! mixed w/ cost limit
! wall 18.060198 comb 18.060000 user 18.060000 sys 0.000000 (best of 3)
$ hg perflrucachedict --size 1000 --gets 1000000 --sets 1000000 --mixed 1000000 --costlimit 10000 --mixedgetfreq 90
! gets w/ cost limit
! wall 0.600024 comb 0.600000 user 0.600000 sys 0.000000 (best of 17)
! inserts w/ cost limit
! wall 37.154547 comb 37.120000 user 37.120000 sys 0.000000 (best of 3)
! mixed w/ cost limit
! wall 4.381602 comb 4.380000 user 4.370000 sys 0.010000 (best of 3)
The functions we're benchmarking are slightly different, which could
move numbers by a few milliseconds. But the slowdown on insert is too
great to be explained by that. The slowness is due to insert heavy
operations needing to call popoldest() repeatedly when the cache is
at capacity. The next commit will address this.
Differential Revision: https://phab.mercurial-scm.org/D4503
$ cat >> $HGRCPATH << EOF
> [extensions]
> show =
> EOF
No arguments shows available views
$ hg init empty
$ cd empty
$ hg show
available views:
bookmarks -- bookmarks and their associated changeset
stack -- current line of work
work -- changesets that aren't finished
abort: no view requested
(use "hg show VIEW" to choose a view)
[255]
`hg help show` prints available views
$ hg help show
hg show VIEW
show various repository information
A requested view of repository data is displayed.
If no view is requested, the list of available views is shown and the
command aborts.
Note:
There are no backwards compatibility guarantees for the output of this
command. Output may change in any future Mercurial release.
Consumers wanting stable command output should specify a template via
"-T/--template".
List of available views:
bookmarks bookmarks and their associated changeset
stack current line of work
work changesets that aren't finished
(use 'hg help -e show' to show help for the show extension)
options:
-T --template TEMPLATE display with template
(some details hidden, use --verbose to show complete help)
Unknown view prints error
$ hg show badview
abort: unknown view: badview
(run "hg show" to see available views)
[255]
HGPLAIN results in abort
$ HGPLAIN=1 hg show bookmarks
abort: must specify a template in plain mode
(invoke with -T/--template to control output format)
[255]
But not if a template is specified
$ HGPLAIN=1 hg show bookmarks -T '{bookmark}\n'
(no bookmarks set)
$ cd ..
bookmarks view with no bookmarks prints empty message
$ hg init books
$ cd books
$ touch f0
$ hg -q commit -A -m initial
$ hg show bookmarks
(no bookmarks set)
bookmarks view shows bookmarks in an aligned table
$ echo book1 > f0
$ hg commit -m 'commit for book1'
$ echo book2 > f0
$ hg commit -m 'commit for book2'
$ hg bookmark -r 1 book1
$ hg bookmark a-longer-bookmark
$ hg show bookmarks
* a-longer-bookmark 7b57
book1 b757
A custom bookmarks template works
$ hg show bookmarks -T '{node} {bookmark} {active}\n'
7b5709ab64cbc34da9b4367b64afff47f2c4ee83 a-longer-bookmark True
b757f780b8ffd71267c6ccb32e0882d9d32a8cc0 book1 False
bookmarks JSON works
$ hg show bookmarks -T json
[
{
"active": true,
"bookmark": "a-longer-bookmark",
"longestbookmarklen": 17,
"node": "7b5709ab64cbc34da9b4367b64afff47f2c4ee83",
"nodelen": 4
},
{
"active": false,
"bookmark": "book1",
"longestbookmarklen": 17,
"node": "b757f780b8ffd71267c6ccb32e0882d9d32a8cc0",
"nodelen": 4
}
]
JSON works with no bookmarks
$ hg book -d a-longer-bookmark
$ hg book -d book1
$ hg show bookmarks -T json
[
]
commands.show.aliasprefix aliases values to `show <view>`
$ hg --config commands.show.aliasprefix=s sbookmarks
(no bookmarks set)
$ hg --config commands.show.aliasprefix=sh shwork
@ 7b57 commit for book2
o b757 commit for book1
o ba59 initial
$ hg --config commands.show.aliasprefix='s sh' swork
@ 7b57 commit for book2
o b757 commit for book1
o ba59 initial
$ hg --config commands.show.aliasprefix='s sh' shwork
@ 7b57 commit for book2
o b757 commit for book1
o ba59 initial
The aliases don't appear in `hg config`
$ hg --config commands.show.aliasprefix=s config alias
[1]
Doesn't overwrite existing alias
$ hg --config alias.swork='log -r .' --config commands.show.aliasprefix=s swork
changeset: 2:7b5709ab64cb
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit for book2
$ hg --config alias.swork='log -r .' --config commands.show.aliasprefix=s config alias
alias.swork=log -r .
$ cd ..