From 572322c695b8a10f8f3640c251a4f26e47d4a651 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 Feb 2007 06:36:20 +0000 Subject: [PATCH] For bug #167450, optimize leaf node selection by ordering nodes from highest to lowest overall reference count. (trunk r6009:6010) svn path=/main/branches/2.1.2/; revision=6011 --- bin/emerge | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bin/emerge b/bin/emerge index 125d1b745..c5ac0d4d1 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1967,6 +1967,16 @@ class depgraph: break return acceptable + def _merge_order_bias(self, nodes): + """Order nodes from highest to lowest overall reference count for + optimal leaf node selection.""" + node_info = {} + for node in self._parent_child_digraph.order: + node_info[node] = len(self.digraph.parent_nodes(node)) + def cmp_merge_preference(node1, node2): + return node_info[node2] - node_info[node1] + nodes.sort(cmp_merge_preference) + def altlist(self, reversed=False): if reversed in self._altlist_cache: return self._altlist_cache[reversed][:] @@ -1976,6 +1986,7 @@ class depgraph: self._altlist_cache[reversed] = retlist[:] return retlist mygraph=self.digraph.copy() + self._merge_order_bias(mygraph.order) myblockers = self.blocker_digraph.copy() retlist=[] circular_blocks = False -- 2.26.2