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 5D6A9138010 for ; Wed, 17 Oct 2012 03:37:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2A97E03E4; Wed, 17 Oct 2012 03:37:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7B91CE03E4 for ; Wed, 17 Oct 2012 03:37:09 +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 DA29333DA01 for ; Wed, 17 Oct 2012 03:37:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5A362E5436 for ; Wed, 17 Oct 2012 03:37:07 +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: <1350445009.fdb856ae456a559fa74066704cd19858d317ed33.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fdb856ae456a559fa74066704cd19858d317ed33 X-VCS-Branch: master Date: Wed, 17 Oct 2012 03:37:07 +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: 8c6b0130-4d13-4cf3-a99f-d25f7fb5ea60 X-Archives-Hash: d8fdbbb0c25e5dd57b639b296fee712b commit: fdb856ae456a559fa74066704cd19858d317ed33 Author: Zac Medico gentoo org> AuthorDate: Wed Oct 17 03:36:49 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 17 03:36:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fdb856ae Scheduler: tweak job_delay calc for bug #438650 * Max delay is reduced to 5 seconds (was 10). * Calculated delay is now proportional to current/desired load ratio. * When a delay is triggered, an event loop timeout is used to ensure that scheduling occurs as soon as the delay expires (rather than waiting for the _loadavg_latency timeout to expire). --- pym/_emerge/Scheduler.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 3b55b2b..99493ea 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -52,6 +52,7 @@ from _emerge.EbuildFetcher import EbuildFetcher from _emerge.EbuildPhase import EbuildPhase from _emerge.emergelog import emergelog from _emerge.FakeVartree import FakeVartree +from _emerge.getloadavg import getloadavg from _emerge._find_deep_system_runtime_deps import _find_deep_system_runtime_deps from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo from _emerge.JobStatusDisplay import JobStatusDisplay @@ -247,9 +248,7 @@ class Scheduler(PollScheduler): # The load average takes some time to respond when new # jobs are added, so we need to limit the rate of adding # new jobs. - self._job_delay_max = 10 - self._job_delay_factor = 1.0 - self._job_delay_exp = 1.5 + self._job_delay_max = 5 self._previous_job_start_time = None # This is used to memoize the _choose_pkg() result when @@ -1584,15 +1583,27 @@ class Scheduler(PollScheduler): if self._jobs and self._max_load is not None: current_time = time.time() + try: + avg1, avg5, avg15 = getloadavg() + except OSError: + return False - delay = self._job_delay_factor * self._jobs ** self._job_delay_exp + delay = self._job_delay_max * avg1 / self._max_load if delay > self._job_delay_max: delay = self._job_delay_max - if (current_time - self._previous_job_start_time) < delay: + elapsed_seconds = current_time - self._previous_job_start_time + # elapsed_seconds < 0 means the system clock has been adjusted + if elapsed_seconds > 0 and elapsed_seconds < delay: + self._event_loop.timeout_add( + 1000 * (delay - elapsed_seconds), self._schedule_once) return True return False + def _schedule_once(self): + self._schedule() + return False + def _schedule_tasks_imp(self): """ @rtype: bool