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 1Ruygl-0005TW-41 for garchives@archives.gentoo.org; Wed, 08 Feb 2012 03:59:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B21D6E076C; Wed, 8 Feb 2012 03:59:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7C330E076C for ; Wed, 8 Feb 2012 03:59:14 +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 CD0F71B4013 for ; Wed, 8 Feb 2012 03:59:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 121A880043 for ; Wed, 8 Feb 2012 03:59:13 +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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AbstractPollTask.py pym/_emerge/SubProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f17ff92635818620ea0df156dee4796c353d954a Date: Wed, 8 Feb 2012 03:59:13 +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: 9e0535fa-e97f-4b4d-b757-2b836c53c3ee X-Archives-Hash: 9e588e47ad140a96fb5faed1a2ead1e3 commit: f17ff92635818620ea0df156dee4796c353d954a Author: Zac Medico gentoo org> AuthorDate: Wed Feb 8 03:58:48 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Feb 8 03:58:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df17ff926 AbstractPollTask: add _wait_loop method --- pym/_emerge/AbstractPollTask.py | 23 ++++++++++++++++++++++- pym/_emerge/SubProcess.py | 8 +++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTa= sk.py index 13e3c23..b4728e7 100644 --- a/pym/_emerge/AbstractPollTask.py +++ b/pym/_emerge/AbstractPollTask.py @@ -1,10 +1,11 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import array import errno import logging import os +import time =20 from portage.util import writemsg_level from _emerge.AsynchronousTask import AsynchronousTask @@ -121,3 +122,23 @@ class AbstractPollTask(AsynchronousTask): self._unregister() self.wait() =20 + def _wait_loop(self, timeout=3DNone): + + if timeout is None: + while self._registered: + self.scheduler.iteration() + return + + remaining_timeout =3D timeout + start_time =3D time.time() + while self._registered: + self.scheduler.iteration() + elapsed_time =3D time.time() - start_time + if elapsed_time < 0: + # The system clock has changed such that start_time + # is now in the future, so just assume that the + # timeout has already elapsed. + break + remaining_timeout =3D timeout - 1000 * elapsed_time + if remaining_timeout <=3D 0: + break diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index c3dc74a..17a3e8f 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -64,8 +64,7 @@ class SubProcess(AbstractPollTask): =20 if self._registered: if self.cancelled: - timeout =3D self._cancel_timeout - self.scheduler.schedule(self._reg_id, timeout=3Dtimeout) + self._wait_loop(timeout=3Dself._cancel_timeout) if self._registered: try: os.kill(self.pid, signal.SIGKILL) @@ -73,12 +72,11 @@ class SubProcess(AbstractPollTask): if e.errno !=3D errno.ESRCH: raise del e - self.scheduler.schedule(self._reg_id, timeout=3Dtimeout) + self._wait_loop(timeout=3Dself._cancel_timeout) if self._registered: self._orphan_process_warn() else: - while self._registered: - self.scheduler.iteration() + self._wait_loop() self._unregister() if self.returncode is not None: return self.returncode