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 F10C5C4363C for ; Wed, 7 Oct 2020 18:01:22 +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 87E612173E for ; Wed, 7 Oct 2020 18:01:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87E612173E 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.3614.10415 (Exim 4.92) (envelope-from ) id 1kQDkX-0004P7-Vd; Wed, 07 Oct 2020 18:01:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3614.10415; Wed, 07 Oct 2020 18:01:13 +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 1kQDkX-0004Ox-RK; Wed, 07 Oct 2020 18:01:13 +0000 Received: by outflank-mailman (input) for mailman id 3614; Wed, 07 Oct 2020 18:01:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQDkW-0003r9-Rc for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:01:12 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 583345bd-7fd4-4cfd-9b83-fc8afdf57668; Wed, 07 Oct 2020 18:00:35 +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 1kQDju-0007CF-84; Wed, 07 Oct 2020 19:00:34 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQDkW-0003r9-Rc for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:01:12 +0000 X-Inumbo-ID: 583345bd-7fd4-4cfd-9b83-fc8afdf57668 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 583345bd-7fd4-4cfd-9b83-fc8afdf57668; Wed, 07 Oct 2020 18:00:35 +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 1kQDju-0007CF-84; Wed, 07 Oct 2020 19:00:34 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Jackson Subject: [OSSTEST PATCH 08/82] host reuse: ms-planner: Bring some variables forward Date: Wed, 7 Oct 2020 18:59:10 +0100 Message-Id: <20201007180024.7932-9-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 Move the scope of $share earlier in cmd_show_html, and also introduce $shared in the colour computation. This makes the next changes easier. No functional change. Signed-off-by: Ian Jackson --- ms-planner | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ms-planner b/ms-planner index 11423404..d9f3db91 100755 --- a/ms-planner +++ b/ms-planner @@ -677,6 +677,7 @@ sub cmd_show_html () { my $shares; foreach my $evt (@{ $plan->{Events}{$reso} }) { my $type= $evt->{Type}; + my $share= $evt->{Share}; my $show= $type eq End ? ($evt->{Share} ? "End $evt->{Info}" : "") : $type eq Unshare ? "$type [".showsharetype($evt->{Info})."]" : @@ -685,7 +686,6 @@ sub cmd_show_html () { (!$evt->{Allocated} ? Booking : ($evt->{Allocated}{Live} ? Allocation : Completed). " $evt->{Allocated}{Task}")." ".$evt->{Info}; - my $share= $evt->{Share}; if ($share) { $show .= sprintf(" [%s %d/%d %d]", showsharetype($share->{Type}), @@ -789,15 +789,16 @@ sub cmd_show_html () { $content->{Avail} || $content->{Type} eq After || ($content->{Allocated} && !$content->{Allocated}{Live}); + my $shared = $content->{Share}; my $bgcolour= $avail ? - ($content->{Share} ? "#ccccff" : "#ffffff") : + ($shared ? "#ccccff" : "#ffffff") : $content->{Type} eq Overrun ? - ($content->{Share} ? "#443344" : "#442222") : + ($shared ? "#443344" : "#442222") : $content->{Allocated} ? - ($content->{Share} ? "#882288" : "#882222") + ($shared ? "#882288" : "#882222") : - ($content->{Share} ? "#005555" : "#448844"); + ($shared ? "#005555" : "#448844"); my $fgcolour= $avail ? "#000000" : "#ffffff"; printf "