From b77afc745bcacf95632ab4aed4ae3698215548a7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 24 Jun 2008 22:53:25 +0000 Subject: [PATCH] If dep calculation time exceeds 20 seconds then automatically enable "complete" mode since any performance difference is not as likely to be noticed by the user after this much time has passed. svn path=/main/trunk/; revision=10773 --- pym/_emerge/__init__.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index fea188f51..108c3321b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1881,7 +1881,14 @@ class depgraph(object): _dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"] + # If dep calculation time exceeds this value then automatically + # enable "complete" mode since any performance difference is + # not as likely to be noticed by the user after this much time + # has passed. + _complete_thresold = 20 + def __init__(self, settings, trees, myopts, myparams, spinner): + self._creation_time = time.time() self.settings = settings self.target_root = settings["ROOT"] self.myopts = myopts @@ -3378,16 +3385,20 @@ class depgraph(object): intially satisfied. Since this method can consume enough time to disturb users, it is - currently only enabled by the --complete-graph option. + currently only enabled by the --complete-graph option, or when + dep calculation time exceeds self._complete_thresold. """ - if "complete" not in self.myparams: - # Skip this to avoid consuming enough time to disturb users. - return 1 - if "--buildpkgonly" in self.myopts or \ "recurse" not in self.myparams: return 1 + if "complete" not in self.myparams: + if time.time() - self._creation_time > self._complete_thresold: + self.myparams.add("complete") + else: + # Skip this to avoid consuming enough time to disturb users. + return 1 + # Put the depgraph into a mode that causes it to only # select packages that have already been added to the # graph or those that are installed and have not been -- 2.26.2