|
 |
9bac43 |
From 8ba2fd89d16cb721110ecff6e95b6eca0a2325f9 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: David Hildenbrand <david@redhat.com>
|
|
|
9bac43 |
Date: Tue, 17 Oct 2017 19:15:56 +0200
|
|
|
9bac43 |
Subject: [PATCH 51/69] tools/kvm_stat: rename 'Current' column to 'CurAvg/s'
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: David Hildenbrand <david@redhat.com>
|
|
|
9bac43 |
Message-id: <20171017191605.2378-31-david@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77341
|
|
|
9bac43 |
O-Subject: [RHEL-7.5 qemu-kvm-rhev PATCH 30/39] tools/kvm_stat: rename 'Current' column to 'CurAvg/s'
|
|
|
9bac43 |
Bugzilla: 1497137
|
|
|
9bac43 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
Upstream-status: linux.git 38e89c37a1e05e6e16af582b980534abda29a4d9
|
|
|
9bac43 |
|
|
|
9bac43 |
commit 38e89c37a1e05e6e16af582b980534abda29a4d9
|
|
|
9bac43 |
Author: Stefan Raspl <raspl@linux.vnet.ibm.com>
|
|
|
9bac43 |
Date: Wed Jun 7 21:08:37 2017 +0200
|
|
|
9bac43 |
|
|
|
9bac43 |
tools/kvm_stat: rename 'Current' column to 'CurAvg/s'
|
|
|
9bac43 |
|
|
|
9bac43 |
'Current' can be misleading as it doesn't tell whether this is the amount
|
|
|
9bac43 |
of events in the last interval or the current average per second.
|
|
|
9bac43 |
Note that this necessitates widening the respective column by one more
|
|
|
9bac43 |
character.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
|
|
|
9bac43 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
scripts/kvm/kvm_stat | 6 +++---
|
|
|
9bac43 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat
|
|
|
9bac43 |
index 35147e4..a9e7ea6 100755
|
|
|
9bac43 |
--- a/scripts/kvm/kvm_stat
|
|
|
9bac43 |
+++ b/scripts/kvm/kvm_stat
|
|
|
9bac43 |
@@ -981,8 +981,8 @@ class Tui(object):
|
|
|
9bac43 |
if len(regex) > MAX_REGEX_LEN:
|
|
|
9bac43 |
regex = regex[:MAX_REGEX_LEN] + '...'
|
|
|
9bac43 |
self.screen.addstr(1, 17, 'regex filter: {0}'.format(regex))
|
|
|
9bac43 |
- self.screen.addstr(2, 1, '%-40s %10s%7s %7s' %
|
|
|
9bac43 |
- ('Event', 'Total', '%Total', 'Current'),
|
|
|
9bac43 |
+ self.screen.addstr(2, 1, '%-40s %10s%7s %8s' %
|
|
|
9bac43 |
+ ('Event', 'Total', '%Total', 'CurAvg/s'),
|
|
|
9bac43 |
curses.A_STANDOUT)
|
|
|
9bac43 |
self.screen.addstr(4, 1, 'Collecting data...')
|
|
|
9bac43 |
self.screen.refresh()
|
|
|
9bac43 |
@@ -1010,7 +1010,7 @@ class Tui(object):
|
|
|
9bac43 |
break
|
|
|
9bac43 |
if values[0] is not None:
|
|
|
9bac43 |
cur = int(round(values[1] / sleeptime)) if values[1] else ''
|
|
|
9bac43 |
- self.screen.addstr(row, 1, '%-40s %10d%7.1f %7s' %
|
|
|
9bac43 |
+ self.screen.addstr(row, 1, '%-40s %10d%7.1f %8s' %
|
|
|
9bac43 |
(key, values[0], values[0] * 100 / total,
|
|
|
9bac43 |
cur))
|
|
|
9bac43 |
row += 1
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|