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 673FE138010 for ; Sat, 6 Oct 2012 04:00:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FBBF21C008; Sat, 6 Oct 2012 04:00:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EB27621C008 for ; Sat, 6 Oct 2012 04:00:42 +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 2A73B33C34C for ; Sat, 6 Oct 2012 04:00:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D6B28E5436 for ; Sat, 6 Oct 2012 04:00:39 +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: <1349496019.637bb91a9439d4bb7f391fe6e804b64592812fdd.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MetadataRegen.py pym/_emerge/PollScheduler.py pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 637bb91a9439d4bb7f391fe6e804b64592812fdd X-VCS-Branch: master Date: Sat, 6 Oct 2012 04:00:39 +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: a2f6fc54-b2d6-408c-bd26-1f6a5c6a4101 X-Archives-Hash: 238bf187226379c538a5fbec6643240e commit: 637bb91a9439d4bb7f391fe6e804b64592812fdd Author: Zac Medico gentoo org> AuthorDate: Sat Oct 6 04:00:19 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 6 04:00:19 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=637bb91a PollScheduler: remove self._jobs This is variable is only needed by the Scheduler class. --- pym/_emerge/MetadataRegen.py | 5 +++-- pym/_emerge/PollScheduler.py | 3 +-- pym/_emerge/Scheduler.py | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index 234298f..46b028a 100644 --- a/pym/_emerge/MetadataRegen.py +++ b/pym/_emerge/MetadataRegen.py @@ -91,6 +91,9 @@ class MetadataRegen(PollScheduler): def _keep_scheduling(self): return self._remaining_tasks and not self._terminated_tasks + def _running_job_count(self): + return len(self._running_tasks) + def run(self): portdb = self._portdb @@ -155,14 +158,12 @@ class MetadataRegen(PollScheduler): self._remaining_tasks = False return - self._jobs += 1 self._running_tasks.add(metadata_process) metadata_process.scheduler = self.sched_iface metadata_process.addExitListener(self._metadata_exit) metadata_process.start() def _metadata_exit(self, metadata_process): - self._jobs -= 1 self._running_tasks.discard(metadata_process) if metadata_process.returncode != os.EX_OK: self.returncode = 1 diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index bcf80ab..1185cd7 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -41,7 +41,6 @@ class PollScheduler(object): self._terminated_tasks = False self._max_jobs = 1 self._max_load = None - self._jobs = 0 self._scheduling = False self._background = False if event_loop is not None: @@ -184,7 +183,7 @@ class PollScheduler(object): return bool(self._running_job_count()) def _running_job_count(self): - return self._jobs + raise NotImplementedError(self) def _can_add_job(self): if self._terminated_tasks: diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 795f503..6a87938 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -225,6 +225,7 @@ class Scheduler(PollScheduler): self._prefetchers = weakref.WeakValueDictionary() self._pkg_queue = [] + self._jobs = 0 self._running_tasks = {} self._completed_tasks = set() @@ -1498,6 +1499,9 @@ class Scheduler(PollScheduler): def _is_work_scheduled(self): return bool(self._running_tasks) + def _running_job_count(self): + return self._jobs + def _schedule_tasks(self): while True: