diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-05-31 16:24:32 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-05-31 16:51:46 -0700 |
| commit | 1ea42d5d12ff3f8e59ebcfd12025d401b51894e1 (patch) | |
| tree | 33c4d4cf7a17274a2b8380c24eab7f3729db5fb2 | |
| parent | depgraph: buidpkgonly error earlier, bug #471910 (diff) | |
| download | portage-1ea42d5d12ff3f8e59ebcfd12025d401b51894e1.tar.gz portage-1ea42d5d12ff3f8e59ebcfd12025d401b51894e1.tar.bz2 portage-1ea42d5d12ff3f8e59ebcfd12025d401b51894e1.zip | |
depgraph: tuple display list, avoid copies
TODO: Optimize _show_merge_list to use reference comparison more
instead of == comparison.
| -rw-r--r-- | pym/_emerge/Scheduler.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/depgraph.py | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 5930550fa..4e8b223fb 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1830,7 +1830,7 @@ class Scheduler(PollScheduler): mylist = mydepgraph.altlist() if mylist: if "--tree" in self.myopts: - mylist.reverse() + mylist = tuple(reversed(mylist)) mydepgraph.display(mylist, favorites=self._favorites) if not success: diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 7929a78f3..9c0a966c5 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5704,9 +5704,13 @@ class depgraph(object): except self._serialize_tasks_retry: pass - retlist = self._dynamic_config._serialized_tasks_cache[:] + retlist = self._dynamic_config._serialized_tasks_cache if reversed: + # TODO: deprecate the "reversed" parameter (builtin name collision) + retlist = list(retlist) retlist.reverse() + retlist = tuple(retlist) + return retlist def _implicit_libc_deps(self, mergelist, graph): @@ -6575,10 +6579,12 @@ class depgraph(object): for blocker in unsolvable_blockers: retlist.append(blocker) + retlist = tuple(retlist) + if unsolvable_blockers and \ not self._accept_blocker_conflicts(): self._dynamic_config._unsatisfied_blockers_for_display = unsolvable_blockers - self._dynamic_config._serialized_tasks_cache = retlist[:] + self._dynamic_config._serialized_tasks_cache = retlist self._dynamic_config._scheduler_graph = scheduler_graph # Blockers don't trigger the _skip_restart flag, since # backtracking may solve blockers when it solves slot @@ -6587,7 +6593,7 @@ class depgraph(object): if self._dynamic_config._slot_collision_info and \ not self._accept_blocker_conflicts(): - self._dynamic_config._serialized_tasks_cache = retlist[:] + self._dynamic_config._serialized_tasks_cache = retlist self._dynamic_config._scheduler_graph = scheduler_graph raise self._unknown_internal_error() @@ -6641,12 +6647,13 @@ class depgraph(object): def _show_merge_list(self): if self._dynamic_config._serialized_tasks_cache is not None and \ not (self._dynamic_config._displayed_list is not None and \ - (self._dynamic_config._displayed_list == self._dynamic_config._serialized_tasks_cache or \ + (self._dynamic_config._displayed_list is self._dynamic_config._serialized_tasks_cache or \ + self._dynamic_config._displayed_list == self._dynamic_config._serialized_tasks_cache or \ self._dynamic_config._displayed_list == \ list(reversed(self._dynamic_config._serialized_tasks_cache)))): - display_list = self._dynamic_config._serialized_tasks_cache[:] + display_list = self._dynamic_config._serialized_tasks_cache if "--tree" in self._frozen_config.myopts: - display_list.reverse() + display_list = tuple(reversed(display_list)) self.display(display_list) def _show_unsatisfied_blockers(self, blockers): |