diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-07-29 21:27:59 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-07-29 21:27:59 +0000 |
commit | 26a87d7e588b6ec5bacf0734985893fdc5adf5cf (patch) | |
tree | 843badf6bb8ec6c966dc18f1ed38558edc5a1bc7 | |
parent | 8f5e0434c9bfca67c1e3f2edc08e92ee552c5de7 (diff) | |
download | portage-26a87d7e588b6ec5bacf0734985893fdc5adf5cf.tar.gz portage-26a87d7e588b6ec5bacf0734985893fdc5adf5cf.tar.bz2 portage-26a87d7e588b6ec5bacf0734985893fdc5adf5cf.zip |
Count state changes in Scheduler._schedule_tasks() and avoid some extra calls
when nothing changes.
svn path=/main/trunk/; revision=11273
-rw-r--r-- | pym/_emerge/__init__.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 9629277a8..09ce0b7c5 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -9655,18 +9655,25 @@ class Scheduler(PollScheduler): def _schedule_tasks(self): remaining, state_change = self._schedule_tasks_imp() self._status_display.display() + + state_change = 0 for q in self._task_queues.values(): - q.schedule() + if q.schedule(): + state_change += 1 # Cancel prefetchers if they're the only reason # the main poll loop is still running. if self._failed_pkgs and \ - not (self._jobs or self._task_queues.merge): + not (self._jobs or self._task_queues.merge) and \ + self._task_queues.fetch: self._task_queues.fetch.clear() + state_change += 1 - remaining, state_change = self._schedule_tasks_imp() - self._status_display.display() - return remaining + if state_change: + remaining, state_change = self._schedule_tasks_imp() + self._status_display.display() + + return bool(self._pkg_queue and not self._failed_pkgs) def _job_delay(self): """ |