summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-19 12:25:39 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-19 12:25:39 +0000
commit18d9229f7eabc568a78f9cda1b1cad186bfa4134 (patch)
treedf2fd4612628602fd01710d448e84793756e24c9
parent8e273781ca8e717a9f03c1ea003c14798323b92c (diff)
downloadportage-18d9229f7eabc568a78f9cda1b1cad186bfa4134.tar.gz
portage-18d9229f7eabc568a78f9cda1b1cad186bfa4134.tar.bz2
portage-18d9229f7eabc568a78f9cda1b1cad186bfa4134.zip
When Scheduler._choose_pkg() is unable to find a package, memoize the result
until at least one of the existing jobs completes. svn path=/main/trunk/; revision=11139
-rw-r--r--pym/_emerge/__init__.py25
1 files changed, 23 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 429bd3fcb..f0c36e458 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8729,6 +8729,11 @@ class Scheduler(PollScheduler):
self._set_digraph(digraph)
+ # This is used to memoize the _choose_pkg() result when
+ # no packages can be chosen until one of the existing
+ # jobs completes.
+ self._choose_pkg_return_early = False
+
features = self.settings.features
if "parallel-fetch" in features and \
not ("--pretend" in self.myopts or \
@@ -9281,14 +9286,14 @@ class Scheduler(PollScheduler):
self._failed_pkgs.append((pkg, merge.returncode))
return
- self._completed_tasks.add(pkg)
+ self._task_complete(pkg)
pkg_to_replace = merge.merge.pkg_to_replace
if pkg_to_replace is not None:
# When a package is replaced, mark it's uninstall
# task complete (if any).
uninst_hash_key = \
("installed", pkg.root, pkg_to_replace.cpv, "uninstall")
- self._completed_tasks.add(uninst_hash_key)
+ self._task_complete(uninst_hash_key)
if pkg.installed:
return
@@ -9322,6 +9327,10 @@ class Scheduler(PollScheduler):
def _extract_exit(self, build):
self._build_exit(build)
+ def _task_complete(self, pkg):
+ self._completed_tasks.add(pkg)
+ self._choose_pkg_return_early = False
+
def _merge(self):
self._add_prefetchers()
@@ -9344,6 +9353,7 @@ class Scheduler(PollScheduler):
def _main_loop_cleanup(self):
del self._pkg_queue[:]
self._completed_tasks.clear()
+ self._choose_pkg_return_early = False
self._status_display.reset()
self._digraph = None
self._task_queues.fetch.clear()
@@ -9352,6 +9362,10 @@ class Scheduler(PollScheduler):
"""
Choose a task that has all it's dependencies satisfied.
"""
+
+ if self._choose_pkg_return_early:
+ return None
+
if self._max_jobs < 2 or self._jobs == 0:
return self._pkg_queue.pop(0)
@@ -9365,6 +9379,13 @@ class Scheduler(PollScheduler):
if chosen_pkg is not None:
self._pkg_queue.remove(chosen_pkg)
+
+ if chosen_pkg is None:
+ # There's no point in searching for a package to
+ # choose until at least one of the existing jobs
+ # completes.
+ self._choose_pkg_return_early = True
+
return chosen_pkg
def _dependent_on_scheduled_merges(self, pkg):