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 1RuzGB-0002tA-Rx for garchives@archives.gentoo.org; Wed, 08 Feb 2012 04:36:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5744AE077F; Wed, 8 Feb 2012 04:35:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 15567E077F for ; Wed, 8 Feb 2012 04:35:52 +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 56CD61B4028 for ; Wed, 8 Feb 2012 04:35:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C5D7E80043 for ; Wed, 8 Feb 2012 04:35:50 +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: <618ad1f92b6f768e5cc2f783cd1756ffe65b3fef.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: 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: 618ad1f92b6f768e5cc2f783cd1756ffe65b3fef Date: Wed, 8 Feb 2012 04:35:50 +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: 34729858-3ed2-4c55-9083-4acce5c0a84d X-Archives-Hash: dcc2e5fc3ab03aafce05627f6c266ff2 commit: 618ad1f92b6f768e5cc2f783cd1756ffe65b3fef Author: Zac Medico gentoo org> AuthorDate: Wed Feb 8 04:35:36 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Feb 8 04:35:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D618ad1f9 PollScheduler: remove _schedule_wait --- pym/_emerge/PollScheduler.py | 48 +-----------------------------------= ------ pym/_emerge/Scheduler.py | 2 +- 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index 9ddcd96..0e510b3 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -62,7 +62,7 @@ class PollScheduler(object): iteration=3Dself._iteration, output=3Dself._task_output, register=3Dself._register, - schedule=3Dself._schedule_wait, + schedule=3Dself._poll_loop, source_remove=3Dself._unregister, timeout_add=3Dself._timeout_add, unregister=3Dself._unregister) @@ -462,52 +462,6 @@ class PollScheduler(object): del self._poll_event_handlers[f] return True =20 - def _schedule_wait(self, wait_ids=3DNone, timeout=3DNone, condition=3DN= one): - """ - Schedule until wait_id is not longer registered - for poll() events. - @type wait_id: int - @param wait_id: a task id to wait for - """ - event_handlers =3D self._poll_event_handlers - handler_ids =3D self._poll_event_handler_ids - event_handled =3D False - - if isinstance(wait_ids, int): - wait_ids =3D frozenset([wait_ids]) - - start_time =3D None - remaining_timeout =3D timeout - timed_out =3D False - if timeout is not None: - start_time =3D time.time() - try: - while (wait_ids is None and event_handlers) or \ - (wait_ids is not None and wait_ids.intersection(handler_ids)): - f, event =3D self._next_poll_event(timeout=3Dremaining_timeout) - x =3D event_handlers[f] - if not x.callback(f, event, *x.args): - self._unregister(x.source_id) - event_handled =3D True - if condition is not None and condition(): - break - if timeout is not None: - 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. - timed_out =3D True - break - remaining_timeout =3D timeout - 1000 * elapsed_time - if remaining_timeout <=3D 0: - timed_out =3D True - break - except StopIteration: - event_handled =3D True - - return event_handled - def _task_output(self, msg, log_path=3DNone, background=3DNone, level=3D0, noiselevel=3D-1): """ diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index e22ef46..afcdda8 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -223,7 +223,7 @@ class Scheduler(PollScheduler): io_add_watch=3Dself._register, iteration=3Dself._iteration, register=3Dself._register, - schedule=3Dself._schedule_wait, + schedule=3Dself._poll_loop, scheduleSetup=3Dself._schedule_setup, scheduleUnpack=3Dself._schedule_unpack, source_remove=3Dself._unregister,