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

     1

  $ hg init t

     2

  $ cd t

     3

  $ echo a > a

     4

  $ hg add a

     5

  $ hg commit -m test

     6

  $ rm .hg/requires

     7

  $ hg tip

     8

  abort: unknown version (2) in revlog 00changelog.i!

     9

  [255]

    10

  $ echo indoor-pool > .hg/requires

    11

  $ hg tip

    12

  abort: repository requires features unknown to this Mercurial: indoor-pool!

    13

  (see https://mercurial-scm.org/wiki/MissingRequirement for more information)

    14

  [255]

    15

  $ echo outdoor-pool >> .hg/requires

    16

  $ hg tip

    17

  abort: repository requires features unknown to this Mercurial: indoor-pool outdoor-pool!

    18

  (see https://mercurial-scm.org/wiki/MissingRequirement for more information)

    19

  [255]

    20

  $ cd ..

    21

    22

Test checking between features supported locally and ones required in

    23

another repository of push/pull/clone on localhost:

    24

    25

  $ mkdir supported-locally

    26

  $ cd supported-locally

    27

    28

  $ hg init supported

    29

  $ echo a > supported/a

    30

  $ hg -R supported commit -Am '#0 at supported'

    31

  adding a

    32

    33

  $ echo 'featuresetup-test' >> supported/.hg/requires

    34

  $ cat > $TESTTMP/supported-locally/supportlocally.py <<EOF

    35

  > from __future__ import absolute_import

    36

  > from mercurial import extensions, localrepo

    37

  > def featuresetup(ui, supported):

    38

  >     for name, module in extensions.extensions(ui):

    39

  >         if __name__ == module.__name__:

    40

  >             # support specific feature locally

    41

  >             supported |= {'featuresetup-test'}

    42

  >             return

    43

  > def uisetup(ui):

    44

  >     localrepo.featuresetupfuncs.add(featuresetup)

    45

  > EOF

    46

  $ cat > supported/.hg/hgrc <<EOF

    47

  > [extensions]

    48

  > # enable extension locally

    49

  > supportlocally = $TESTTMP/supported-locally/supportlocally.py

    50

  > EOF

    51

  $ hg -R supported status

    52

    53

  $ hg init push-dst

    54

  $ hg -R supported push push-dst

    55

  pushing to push-dst

    56

  abort: required features are not supported in the destination: featuresetup-test

    57

  [255]

    58

    59

  $ hg init pull-src

    60

  $ hg -R pull-src pull supported

    61

  pulling from supported

    62

  abort: required features are not supported in the destination: featuresetup-test

    63

  [255]

    64

    65

  $ hg clone supported clone-dst

    66

  abort: repository requires features unknown to this Mercurial: featuresetup-test!

    67

  (see https://mercurial-scm.org/wiki/MissingRequirement for more information)

    68

  [255]

    69

  $ hg clone --pull supported clone-dst

    70

  abort: required features are not supported in the destination: featuresetup-test

    71

  [255]

    72

    73

  $ cd ..