|
 |
4a2fec |
From 3e1d2fc34c6ff536cfcc2787a98e579ff31550b1 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: David Hildenbrand <david@redhat.com>
|
|
|
4a2fec |
Date: Tue, 17 Oct 2017 19:15:35 +0200
|
|
|
4a2fec |
Subject: [PATCH 30/69] tools/kvm_stat: display guest name when using pid
|
|
|
4a2fec |
filter
|
|
|
4a2fec |
MIME-Version: 1.0
|
|
|
4a2fec |
Content-Type: text/plain; charset=UTF-8
|
|
|
4a2fec |
Content-Transfer-Encoding: 8bit
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: David Hildenbrand <david@redhat.com>
|
|
|
4a2fec |
Message-id: <20171017191605.2378-10-david@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77317
|
|
|
4a2fec |
O-Subject: [RHEL-7.5 qemu-kvm-rhev PATCH 09/39] tools/kvm_stat: display guest name when using pid filter
|
|
|
4a2fec |
Bugzilla: 1497137
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Upstream-status: linux.git a24e85f6a69f09a9d09a86110a6bb168c60610ef
|
|
|
4a2fec |
|
|
|
4a2fec |
commit a24e85f6a69f09a9d09a86110a6bb168c60610ef
|
|
|
4a2fec |
Author: Stefan Raspl <raspl@linux.vnet.ibm.com>
|
|
|
4a2fec |
Date: Fri Mar 10 13:40:08 2017 +0100
|
|
|
4a2fec |
|
|
|
4a2fec |
tools/kvm_stat: display guest name when using pid filter
|
|
|
4a2fec |
|
|
|
4a2fec |
When running kvm_stat with option '-p' to filter per process, display
|
|
|
4a2fec |
the QEMU guest name next to the pid, if available.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
|
|
|
4a2fec |
Reviewed-By: Janosch Frank <frankja@linux.vnet.ibm.com>
|
|
|
4a2fec |
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
scripts/kvm/kvm_stat | 41 +++++++++++++++++++++++++++++++++++++++--
|
|
|
4a2fec |
1 file changed, 39 insertions(+), 2 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat
|
|
|
4a2fec |
index aca8508..95ffa9a 100755
|
|
|
4a2fec |
--- a/scripts/kvm/kvm_stat
|
|
|
4a2fec |
+++ b/scripts/kvm/kvm_stat
|
|
|
4a2fec |
@@ -320,6 +320,37 @@ def parse_int_list(list_string):
|
|
|
4a2fec |
return integers
|
|
|
4a2fec |
|
|
|
4a2fec |
|
|
|
4a2fec |
+def get_gname_from_pid(pid):
|
|
|
4a2fec |
+ """Returns the guest name for a QEMU process pid.
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+ Extracts the guest name from the QEMU comma line by processing the '-name'
|
|
|
4a2fec |
+ option. Will also handle names specified out of sequence.
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+ """
|
|
|
4a2fec |
+ name = ''
|
|
|
4a2fec |
+ try:
|
|
|
4a2fec |
+ line = open('/proc/{}/cmdline'.format(pid), 'rb').read().split('\0')
|
|
|
4a2fec |
+ parms = line[line.index('-name') + 1].split(',')
|
|
|
4a2fec |
+ while '' in parms:
|
|
|
4a2fec |
+ # commas are escaped (i.e. ',,'), hence e.g. 'foo,bar' results in
|
|
|
4a2fec |
+ # ['foo', '', 'bar'], which we revert here
|
|
|
4a2fec |
+ idx = parms.index('')
|
|
|
4a2fec |
+ parms[idx - 1] += ',' + parms[idx + 1]
|
|
|
4a2fec |
+ del parms[idx:idx+2]
|
|
|
4a2fec |
+ # the '-name' switch allows for two ways to specify the guest name,
|
|
|
4a2fec |
+ # where the plain name overrides the name specified via 'guest='
|
|
|
4a2fec |
+ for arg in parms:
|
|
|
4a2fec |
+ if '=' not in arg:
|
|
|
4a2fec |
+ name = arg
|
|
|
4a2fec |
+ break
|
|
|
4a2fec |
+ if arg[:6] == 'guest=':
|
|
|
4a2fec |
+ name = arg[6:]
|
|
|
4a2fec |
+ except (ValueError, IOError, IndexError):
|
|
|
4a2fec |
+ pass
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+ return name
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+
|
|
|
4a2fec |
def get_online_cpus():
|
|
|
4a2fec |
"""Returns a list of cpu id integers."""
|
|
|
4a2fec |
with open('/sys/devices/system/cpu/online') as cpu_list:
|
|
|
4a2fec |
@@ -803,6 +834,7 @@ LABEL_WIDTH = 40
|
|
|
4a2fec |
NUMBER_WIDTH = 10
|
|
|
4a2fec |
DELAY_INITIAL = 0.25
|
|
|
4a2fec |
DELAY_REGULAR = 3.0
|
|
|
4a2fec |
+MAX_GUEST_NAME_LEN = 48
|
|
|
4a2fec |
|
|
|
4a2fec |
|
|
|
4a2fec |
class Tui(object):
|
|
|
4a2fec |
@@ -863,9 +895,14 @@ class Tui(object):
|
|
|
4a2fec |
if pid is None:
|
|
|
4a2fec |
pid = self.stats.pid_filter
|
|
|
4a2fec |
self.screen.erase()
|
|
|
4a2fec |
+ gname = get_gname_from_pid(pid)
|
|
|
4a2fec |
+ if gname:
|
|
|
4a2fec |
+ gname = ('({})'.format(gname[:MAX_GUEST_NAME_LEN] + '...'
|
|
|
4a2fec |
+ if len(gname) > MAX_GUEST_NAME_LEN
|
|
|
4a2fec |
+ else gname))
|
|
|
4a2fec |
if pid > 0:
|
|
|
4a2fec |
- self.screen.addstr(0, 0, 'kvm statistics - pid {0}'
|
|
|
4a2fec |
- .format(pid), curses.A_BOLD)
|
|
|
4a2fec |
+ self.screen.addstr(0, 0, 'kvm statistics - pid {0} {1}'
|
|
|
4a2fec |
+ .format(pid, gname), curses.A_BOLD)
|
|
|
4a2fec |
else:
|
|
|
4a2fec |
self.screen.addstr(0, 0, 'kvm statistics - summary', curses.A_BOLD)
|
|
|
4a2fec |
self.screen.addstr(2, 1, 'Event')
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|