From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BA6AC4727E for ; Wed, 7 Oct 2020 18:28:53 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C69B2168B for ; Wed, 7 Oct 2020 18:28:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C69B2168B Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.3747.11252 (Exim 4.92) (envelope-from ) id 1kQEB4-0005tw-LD; Wed, 07 Oct 2020 18:28:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3747.11252; Wed, 07 Oct 2020 18:28:38 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQEB3-0005rq-Af; Wed, 07 Oct 2020 18:28:37 +0000 Received: by outflank-mailman (input) for mailman id 3747; Wed, 07 Oct 2020 18:28:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE5G-00072Q-Nq for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:22:38 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fd487d61-c3bd-4c0c-9178-6cbdf434cb81; Wed, 07 Oct 2020 18:21:02 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDk1-0007CF-Er; Wed, 07 Oct 2020 19:00:41 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE5G-00072Q-Nq for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:22:38 +0000 X-Inumbo-ID: fd487d61-c3bd-4c0c-9178-6cbdf434cb81 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fd487d61-c3bd-4c0c-9178-6cbdf434cb81; Wed, 07 Oct 2020 18:21:02 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDk1-0007CF-Er; Wed, 07 Oct 2020 19:00:41 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 32/82] plan_search: Use plan's Wear information rather than tracking it ourselves Date: Wed, 7 Oct 2020 18:59:34 +0100 Message-Id: <20201007180024.7932-33-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201007180024.7932-1-iwj@xenproject.org> References: <20201007180024.7932-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ian Jackson There is no reason not to use this information from the plan. Not computing it ourselves saves some confusing logic here. Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index dfa3710a..e17b6503 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -675,7 +675,6 @@ sub plan_search ($$$$) { my $reqix= 0; my $try_time= 0; my $confirmedok= 0; - my $share_wear; my $share_reuse= 0; for (;;) { @@ -689,8 +688,7 @@ sub plan_search ($$$$) { PERIOD: foreach (my $ix=0; $ix<@$events; $ix++) { $dbgprint->("PLAN LOOP reqs[$reqix]=$req->{Ident}". - " evtix=$ix try=$try_time confirmed=$confirmedok". - (defined($share_wear) ? " wear=$share_wear" : "")); + " evtix=$ix try=$try_time confirmed=$confirmedok"); # check the period from $events[$ix] to next event my $startevt= $events->[$ix]; @@ -710,12 +708,8 @@ sub plan_search ($$$$) { ($req->{SharedMaxTasks}//'')); return 0 unless defined $req->{Shared}; return 0 unless $req->{Shared} eq $eshare->{Type}; - if (defined $share_wear) { - $share_wear++ if $startevt->{Type} eq 'Start'; - } else { - $share_wear= $eshare->{Wear}+1; - } - return 0 if $share_wear > $req->{SharedMaxWear}; + my $wear= $eshare->{Wear}+1; + return 0 if $wear > $req->{SharedMaxWear}; return 0 if $eshare->{Shares} != $req->{SharedMaxTasks}; $dbgprint->("PLAN LOOP SHARE-COMPAT-OK Y"); return 1; @@ -742,13 +736,11 @@ sub plan_search ($$$$) { # nope $try_time= $endevt->{Time}; $confirmedok= 0; - undef $share_wear; $share_reuse= 0; $dbgprint->("PLAN LOOP OVERLAP BAD $try_time"); } $dbgprint->("PLAN NEXT reqs[$reqix]=$req->{Ident}". - " try=$try_time confirmed=$confirmedok reuse=$share_reuse". - (defined($share_wear) ? " wear=$share_wear" : "")); + " try=$try_time confirmed=$confirmedok reuse=$share_reuse"); $confirmedok++; $share_reuse++ if defined $share_wear; -- 2.20.1