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 6ACE6C4363C for ; Wed, 7 Oct 2020 18:01:28 +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 0B6412076C for ; Wed, 7 Oct 2020 18:01:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B6412076C 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.3615.10427 (Exim 4.92) (envelope-from ) id 1kQDkd-0004VQ-9j; Wed, 07 Oct 2020 18:01:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3615.10427; Wed, 07 Oct 2020 18:01:19 +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 1kQDkd-0004VG-5a; Wed, 07 Oct 2020 18:01:19 +0000 Received: by outflank-mailman (input) for mailman id 3615; Wed, 07 Oct 2020 18:01:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQDkb-0003r9-Rh for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:01:17 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 96361b6a-c30f-4d7b-a433-2f271bf7a56d; 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-F2; 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 1kQDkb-0003r9-Rh for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:01:17 +0000 X-Inumbo-ID: 96361b6a-c30f-4d7b-a433-2f271bf7a56d Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 96361b6a-c30f-4d7b-a433-2f271bf7a56d; 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-F2; 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 09/82] host reuse: ms-planner: Do not show reuse as shared in the plan Date: Wed, 7 Oct 2020 18:59:11 +0100 Message-Id: <20201007180024.7932-10-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 If the number of shares is 1, do not show it as shared, and also ignore the Unshare events. This clarifies the display, especially when used with forthcoming test host reuse work. Signed-off-by: Ian Jackson --- ms-planner | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ms-planner b/ms-planner index d9f3db91..4e38e4e3 100755 --- a/ms-planner +++ b/ms-planner @@ -249,6 +249,7 @@ sub launder_check_plan () { Avail => 1, Info => $cshare->{Type}, PreviousShare => $cshare, + Shares => $cshare->{Shares}, }; $cshare= undef; } @@ -678,6 +679,7 @@ sub cmd_show_html () { foreach my $evt (@{ $plan->{Events}{$reso} }) { my $type= $evt->{Type}; my $share= $evt->{Share}; + next if $type eq 'Unshare' && $evt->{Shares} == 1; my $show= $type eq End ? ($evt->{Share} ? "End $evt->{Info}" : "") : $type eq Unshare ? "$type [".showsharetype($evt->{Info})."]" : @@ -686,7 +688,7 @@ sub cmd_show_html () { (!$evt->{Allocated} ? Booking : ($evt->{Allocated}{Live} ? Allocation : Completed). " $evt->{Allocated}{Task}")." ".$evt->{Info}; - if ($share) { + if ($share && $share->{Shares} != 1) { $show .= sprintf(" [%s %d/%d %d]", showsharetype($share->{Type}), $share->{Shares} - $evt->{Avail}, @@ -789,7 +791,8 @@ sub cmd_show_html () { $content->{Avail} || $content->{Type} eq After || ($content->{Allocated} && !$content->{Allocated}{Live}); - my $shared = $content->{Share}; + my $shared = $content->{Share} + && $content->{Share}{Shares} != 1; my $bgcolour= $avail ? ($shared ? "#ccccff" : "#ffffff") : -- 2.20.1