From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A49DF1381F3 for ; Fri, 31 May 2013 23:24:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 427FEE0946; Fri, 31 May 2013 23:24:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBE0AE0946 for ; Fri, 31 May 2013 23:24:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9086E33DFFA for ; Fri, 31 May 2013 23:24:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 232D2E5309 for ; Fri, 31 May 2013 23:24:51 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1370042672.4d031fd366f2ee135145181d449c5047badbc7e5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4d031fd366f2ee135145181d449c5047badbc7e5 X-VCS-Branch: master Date: Fri, 31 May 2013 23:24:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5e6d5fe4-5302-4a3d-8122-ab5d07cbfbdb X-Archives-Hash: 37c5e7378431ec2e1b3c3bc2d65e0f81 commit: 4d031fd366f2ee135145181d449c5047badbc7e5 Author: Zac Medico gentoo org> AuthorDate: Fri May 31 23:24:32 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri May 31 23:24:32 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4d031fd3 depgraph: tuple display list, avoid copies TODO: Optimize _show_merge_list to use reference comparison more instead of == comparison. --- pym/_emerge/depgraph.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 7929a78..9c0a966 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):