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

  $ echo '[extensions]' >> $HGRCPATH

     2

  $ echo 'strip =' >> $HGRCPATH

     3

     4

  $ cat >findbranch.py <<EOF

     5

  > from __future__ import absolute_import

     6

  > import re

     7

  > import sys

     8

  > 

     9

  > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')

    10

  > 

    11

  > for line in sys.stdin:

    12

  >     hmatch = head_re.match(line)

    13

  >     if not hmatch:

    14

  >         sys.exit(1)

    15

  >     if hmatch.group(1) == 'Branch':

    16

  >         sys.exit(0)

    17

  > sys.exit(1)

    18

  > EOF

    19

    20

  $ hg init a

    21

  $ cd a

    22

  $ echo "Rev 1" >rev

    23

  $ hg add rev

    24

  $ hg commit -m "No branch."

    25

  $ hg branch abranch

    26

  marked working directory as branch abranch

    27

  (branches are permanent and global, did you want a bookmark?)

    28

  $ echo "Rev  2" >rev

    29

  $ hg commit -m "With branch."

    30

    31

  $ hg export 0 > ../r0.patch

    32

  $ hg export 1 > ../r1.patch

    33

  $ cd ..

    34

    35

  $ if $PYTHON findbranch.py < r0.patch; then

    36

  >     echo "Export of default branch revision has Branch header" 1>&2

    37

  >     exit 1

    38

  > fi

    39

    40

  $ if $PYTHON findbranch.py < r1.patch; then

    41

  >     :  # Do nothing

    42

  > else

    43

  >     echo "Export of branch revision is missing Branch header" 1>&2

    44

  >     exit 1

    45

  > fi

    46

    47

Make sure import still works with branch information in patches.

    48

    49

  $ hg init b

    50

  $ cd b

    51

  $ hg import ../r0.patch

    52

  applying ../r0.patch

    53

  $ hg import ../r1.patch

    54

  applying ../r1.patch

    55

  $ cd ..

    56

    57

  $ hg init c

    58

  $ cd c

    59

  $ hg import --exact --no-commit ../r0.patch

    60

  applying ../r0.patch

    61

  warning: can't check exact import with --no-commit

    62

  $ hg st

    63

  A rev

    64

  $ hg revert -a

    65

  forgetting rev

    66

  $ rm rev

    67

  $ hg import --exact ../r0.patch

    68

  applying ../r0.patch

    69

  $ hg import --exact ../r1.patch

    70

  applying ../r1.patch

    71

    72

Test --exact and patch header separators (issue3356)

    73

    74

  $ hg strip --no-backup .

    75

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    76

  >>> import re

    77

  >>> p = open('../r1.patch', 'rb').read()

    78

  >>> p = re.sub(br'Parent\s+', b'Parent ', p)

    79

  >>> open('../r1-ws.patch', 'wb').write(p) and None

    80

  $ hg import --exact ../r1-ws.patch

    81

  applying ../r1-ws.patch

    82

    83

  $ cd ..