D4504: util: optimize cost auditing on insert

[indygreg (Gregory Szorc)]

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Calling popoldest() on insert with cost auditing enabled introduces
  significant overhead.
  
  The primary reason for this overhead is that popoldest() needs to
  walk the linked list to find the first non-empty node. When we
  call popoldest() within a loop, this can become quadratic. The
  performance impact is more pronounced on caches with large capacities.
  
  This commit effectively inlines the popoldest() call into
  _enforcecostlimit(). By doing so, we only do the backwards walk
  to find the first empty node once. However, we still may still
  perform this work on insert when the cache is near cost capacity.
  So this is only a partial performance win.
  
  $ 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)
  ! wall 1.659181 comb 1.650000 user 1.650000 sys 0.000000 (best of 7)
  ! mixed w/ cost limit
  ! wall 1.157655 comb 1.150000 user 1.150000 sys 0.000000 (best of 9)
  ! wall 1.139955 comb 1.140000 user 1.140000 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)
  ! wall 0.601993 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)
  ! wall 25.105273 comb 25.080000 user 25.080000 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)
  ! wall 12.104470 comb 12.070000 user 12.070000 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)
  ! wall 0.614439 comb 0.620000 user 0.620000 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)
  ! wall 25.963028 comb 25.960000 user 25.960000 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)
  ! wall 3.174256 comb 3.170000 user 3.170000 sys 0.000000 (best of 4)

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4504

AFFECTED FILES
  mercurial/util.py

CHANGE DETAILS

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1464,8 +1464,23 @@
         # This should run after an insertion. It should only be called if total
         # cost limits are being enforced.
         # The most recently inserted node is never evicted.
+        if len(self) <= 1 or self.totalcost <= self.maxcost:
+            return
+
+        # This is logically equivalent to calling popoldest() until we
+        # free up enough cost. We don't do that since popoldest() needs
+        # to walk the linked list and doing this in a loop would be
+        # quadratic. So we find the first non-empty node and then
+        # walk nodes until we free up enough capacity.
+        n = self._head.prev
+        while n.key is _notset:
+            n = n.prev
+
         while len(self) > 1 and self.totalcost > self.maxcost:
-            self.popoldest()
+            del self._cache[n.key]
+            self.totalcost -= n.cost
+            n.markempty()
+            n = n.prev
 
 def lrucachefunc(func):
     '''cache most recent results of function calls'''



To: indygreg, #hg-reviewers
Cc: mercurial-devel