From nobody Tue Nov 4 11:33:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1602095340; cv=none; d=zohomail.com; s=zohoarc; b=UoynurBYEjFkDP70cOQJFijTiTcQg6KhXlhc8c93o4Er1VVrhKGoQM5eHX4HeuUBhFktnN29WbCmzSCJnJjFSJ9Cc5anq5yzzbQ9gGaORfJzvRnqP1Tt+bRc4rvGl5mwaWSXGkKDhxuOfoWlCP4LihtdHjg8ZLFoL0l7V4v0pvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602095340; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m2oALK6T/EirVOUbHcVVXwkOuvJujvedj5kqpSE1VF4=; b=h3O5vus1TLxpsL2Y7oyTsjz02q6lw4igaOGJ2U/ll91LWSwWw6SMakwT2vZWHJwK19z4hS2fuK/KY+Wosu6JJb5mI5wWHf9ly0H64Gbz6k+3u9aiGP+JnIT5+Cp+j32WQjesspFIpOx+gRMK7SwcYJDkRYIbkTxJFxXbjN6am6o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1602095340794576.4282303127189; Wed, 7 Oct 2020 11:29:00 -0700 (PDT) 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 Received: by outflank-mailman (output) from mailman id 3747.11252; Wed, 07 Oct 2020 18:28:38 +0000 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 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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" X-Inumbo-ID: fd487d61-c3bd-4c0c-9178-6cbdf434cb81 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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=3D 0; my $try_time=3D 0; my $confirmedok=3D 0; - my $share_wear; my $share_reuse=3D 0; =20 for (;;) { @@ -689,8 +688,7 @@ sub plan_search ($$$$) { PERIOD: foreach (my $ix=3D0; $ix<@$events; $ix++) { $dbgprint->("PLAN LOOP reqs[$reqix]=3D$req->{Ident}". - " evtix=3D$ix try=3D$try_time confirmed=3D$confirmedok". - (defined($share_wear) ? " wear=3D$share_wear" : "")); + " evtix=3D$ix try=3D$try_time confirmed=3D$confirmedok"); =20 # check the period from $events[$ix] to next event my $startevt=3D $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=3D $eshare->{Wear}+1; - } - return 0 if $share_wear > $req->{SharedMaxWear}; + my $wear=3D $eshare->{Wear}+1; + return 0 if $wear > $req->{SharedMaxWear}; return 0 if $eshare->{Shares} !=3D $req->{SharedMaxTasks}; $dbgprint->("PLAN LOOP SHARE-COMPAT-OK Y"); return 1; @@ -742,13 +736,11 @@ sub plan_search ($$$$) { # nope $try_time=3D $endevt->{Time}; $confirmedok=3D 0; - undef $share_wear; $share_reuse=3D 0; $dbgprint->("PLAN LOOP OVERLAP BAD $try_time"); } $dbgprint->("PLAN NEXT reqs[$reqix]=3D$req->{Ident}". - " try=3D$try_time confirmed=3D$confirmedok reuse=3D$share_reuse". - (defined($share_wear) ? " wear=3D$share_wear" : "")); + " try=3D$try_time confirmed=3D$confirmedok reuse=3D$share_reuse"); =20 $confirmedok++; $share_reuse++ if defined $share_wear; --=20 2.20.1