From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RuyJJ-0001PU-BL for garchives@archives.gentoo.org; Wed, 08 Feb 2012 03:35:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79807E077F; Wed, 8 Feb 2012 03:35:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1BF15E077F for ; Wed, 8 Feb 2012 03:35:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 470331B4034 for ; Wed, 8 Feb 2012 03:34:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B65E08004F for ; Wed, 8 Feb 2012 03:34:58 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <082c908cd82426dfd45a2bf0ca9741213a7c7d5f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AsynchronousLock.py pym/_emerge/CompositeTask.py pym/_emerge/FifoIpcDaemon.py pym/_emerge/PipeReader.py pym/_emerge/SubProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 082c908cd82426dfd45a2bf0ca9741213a7c7d5f Date: Wed, 8 Feb 2012 03:34:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9d6e0e26-6ec9-4e09-af3a-d7b3140cc3f7 X-Archives-Hash: 24940dfc53611807e30300e07e10d209 commit: 082c908cd82426dfd45a2bf0ca9741213a7c7d5f Author: Zac Medico gentoo org> AuthorDate: Wed Feb 8 03:26:21 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Feb 8 03:34:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D082c908c Use PollScheduler iteration method. --- pym/_emerge/AsynchronousLock.py | 10 +++++----- pym/_emerge/CompositeTask.py | 5 +++-- pym/_emerge/FifoIpcDaemon.py | 7 +++---- pym/_emerge/PipeReader.py | 7 +++---- pym/_emerge/SubProcess.py | 5 +++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLo= ck.py index e166df3..2c4fe10 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import dummy_threading @@ -152,8 +152,8 @@ class _LockThread(AbstractPollTask): def _wait(self): if self.returncode is not None: return self.returncode - if self._registered: - self.scheduler.schedule(self._reg_id) + while self._registered: + self.scheduler.iteration() return self.returncode =20 def unlock(self): @@ -264,8 +264,8 @@ class _LockProcess(AbstractPollTask): def _wait(self): if self.returncode is not None: return self.returncode - if self._registered: - self.scheduler.schedule(self._reg_id) + while self._registered: + self.scheduler.iteration() return self.returncode =20 def _output_handler(self, f, event): diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index 644a69b..e56188d 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from _emerge.AsynchronousTask import AsynchronousTask @@ -60,7 +60,8 @@ class CompositeTask(AsynchronousTask): self._current_task =3D None break else: - self.scheduler.schedule(condition=3Dself._task_queued_wait) + while not self._task_queued_wait(): + self.scheduler.iteration() if self.returncode is not None: break elif self.cancelled: diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py index b1f7a95..cbe8058 100644 --- a/pym/_emerge/FifoIpcDaemon.py +++ b/pym/_emerge/FifoIpcDaemon.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from portage import os @@ -52,9 +52,8 @@ class FifoIpcDaemon(AbstractPollTask): if self.returncode is not None: return self.returncode =20 - if self._registered: - self.scheduler.schedule(self._reg_id) - self._unregister() + while self._registered: + self.scheduler.iteration() =20 if self.returncode is None: self.returncode =3D os.EX_OK diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index a85d794..54c6eb7 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from portage import os @@ -44,9 +44,8 @@ class PipeReader(AbstractPollTask): if self.returncode is not None: return self.returncode =20 - if self._registered: - self.scheduler.schedule(self._reg_ids) - self._unregister() + while self._registered: + self.scheduler.iteration() =20 self.returncode =3D os.EX_OK return self.returncode diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index c5cac7d..c3dc74a 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from portage import os @@ -77,7 +77,8 @@ class SubProcess(AbstractPollTask): if self._registered: self._orphan_process_warn() else: - self.scheduler.schedule(self._reg_id) + while self._registered: + self.scheduler.iteration() self._unregister() if self.returncode is not None: return self.returncode