From 61da71968ea44964fd1dd2e449b053c77eb83139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyril=20R=C3=A9bert=20=28zithro=29?= Date: Tue, 27 Feb 2024 14:06:53 +0100 Subject: [PATCH 11/67] tools/xentop: fix sorting bug for some columns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sort doesn't work on columns VBD_OO, VBD_RD, VBD_WR and VBD_RSECT. Fix by adjusting variables names in compare functions. Bug fix only. No functional change. Fixes: 91c3e3dc91d6 ("tools/xentop: Display '-' when stats are not available.") Signed-off-by: Cyril Rébert (zithro) Reviewed-by: Anthony PERARD master commit: 29f17d837421f13c0e0010802de1b2d51d2ded4a master date: 2024-02-05 17:58:23 +0000 --- tools/xentop/xentop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index 950e8935c4..545bd5e96d 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -684,7 +684,7 @@ static int compare_vbd_oo(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_oo = 0, dom2_vbd_oo = 0; tot_vbd_reqs(domain1, FIELD_VBD_OO, &dom1_vbd_oo); - tot_vbd_reqs(domain1, FIELD_VBD_OO, &dom2_vbd_oo); + tot_vbd_reqs(domain2, FIELD_VBD_OO, &dom2_vbd_oo); return -compare(dom1_vbd_oo, dom2_vbd_oo); } @@ -711,9 +711,9 @@ static int compare_vbd_rd(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_rd = 0, dom2_vbd_rd = 0; tot_vbd_reqs(domain1, FIELD_VBD_RD, &dom1_vbd_rd); - tot_vbd_reqs(domain1, FIELD_VBD_RD, &dom2_vbd_rd); + tot_vbd_reqs(domain2, FIELD_VBD_RD, &dom2_vbd_rd); - return -compare(dom1_vbd_rd, dom1_vbd_rd); + return -compare(dom1_vbd_rd, dom2_vbd_rd); } /* Prints number of total VBD READ requests statistic */ @@ -738,7 +738,7 @@ static int compare_vbd_wr(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_wr = 0, dom2_vbd_wr = 0; tot_vbd_reqs(domain1, FIELD_VBD_WR, &dom1_vbd_wr); - tot_vbd_reqs(domain1, FIELD_VBD_WR, &dom2_vbd_wr); + tot_vbd_reqs(domain2, FIELD_VBD_WR, &dom2_vbd_wr); return -compare(dom1_vbd_wr, dom2_vbd_wr); } @@ -765,7 +765,7 @@ static int compare_vbd_rsect(xenstat_domain *domain1, xenstat_domain *domain2) unsigned long long dom1_vbd_rsect = 0, dom2_vbd_rsect = 0; tot_vbd_reqs(domain1, FIELD_VBD_RSECT, &dom1_vbd_rsect); - tot_vbd_reqs(domain1, FIELD_VBD_RSECT, &dom2_vbd_rsect); + tot_vbd_reqs(domain2, FIELD_VBD_RSECT, &dom2_vbd_rsect); return -compare(dom1_vbd_rsect, dom2_vbd_rsect); } -- 2.44.0