aboutsummaryrefslogtreecommitdiffstats
path: root/lib/_emerge/depgraph.py
diff options
context:
space:
mode:
authorDaniel Harding <dharding@living180.net>2023-09-10 09:51:13 +0300
committerSam James <sam@gentoo.org>2023-09-21 16:46:00 +0100
commitc6ee4348df65210ee4c052b894cbc9f4f54f6ce8 (patch)
treec3a77f408903b9721bf1519c57077aa45bc53924 /lib/_emerge/depgraph.py
parentCatch error when trust helper is not found (diff)
downloadgentoo-portage-c6ee4348df65210ee4c052b894cbc9f4f54f6ce8.tar.xz
gentoo-portage-c6ee4348df65210ee4c052b894cbc9f4f54f6ce8.zip
depgraph: improve reverse dep caching
Avoid applying @functools.lru_cache() to the depgraph._slot_operator_check_reverse_depencencies() method, as applying the lru_cache decorator to a method can prevent the class instances from being garbage collected due to self being stored in the cache as part of the args key[1]. Instead, set up a per-instance cache in the __init__() method. [1] https://stackoverflow.com/q/33672412/3573385 Bug: https://bugs.gentoo.org/883071 Signed-off-by: Daniel Harding <dharding@living180.net> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'lib/_emerge/depgraph.py')
-rw-r--r--lib/_emerge/depgraph.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 01a49bcb53ac..0629acab22fe 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -679,6 +679,12 @@ class depgraph:
self.query = UserQuery(myopts).query
+ # Set up a per-instance memoization cache for the
+ # _slot_operator_check_reverse_dependencies() method:
+ self._slot_operator_check_reverse_dependencies = functools.lru_cache(
+ maxsize=100
+ )(self._slot_operator_check_reverse_dependencies)
+
def _index_binpkgs(self):
for root in self._frozen_config.trees:
bindb = self._frozen_config.trees[root]["bintree"].dbapi
@@ -2214,7 +2220,8 @@ class depgraph:
return None
- @functools.lru_cache(maxsize=100)
+ # This method is memoized on a per-instance basis via a decorator applied
+ # in __init__().
def _slot_operator_check_reverse_dependencies(
self, existing_pkg, candidate_pkg, replacement_parent=None
):