ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scripts/kvm/kvm_stat: Fixup filtering 

When filtering, the group leader event should not be disabled, as all
other events under it will also be disabled. Also we should make sure
that values from disabled fields will not be displayed.

This also filters the fields from the log and batch output for better
readability.

Also the drilldown update now directly checks for the stats' field
filter and (un)sets drilldown accordingly.

Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Message-Id: <1452525484-32309-33-git-send-email-frankja@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Janosch Frank 2016-01-11 16:18:02 +01:00 committed by Paolo Bonzini
parent 1cd55f9dc7
commit 126b33e619
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/kvm/kvm_stat
View File

@ -467,6 +467,9 @@ class TracepointProvider(object):
trace_filter=tracefilter)) trace_filter=tracefilter))
self.group_leaders.append(group) self.group_leaders.append(group)
def available_fields(self):
return self.get_available_fields()
@property @property
def fields(self): def fields(self):
return self._fields return self._fields
@ -475,23 +478,30 @@ class TracepointProvider(object):
def fields(self, fields): def fields(self, fields):
self._fields = fields self._fields = fields
for group in self.group_leaders: for group in self.group_leaders:
for event in group.events: for index, event in enumerate(group.events):
if event.name in fields: if event.name in fields:
event.reset() event.reset()
event.enable() event.enable()
else: else:
event.disable() # Do not disable the group leader.
# It would disable all of its events.
if index != 0:
event.disable()
def read(self): def read(self):
ret = defaultdict(int) ret = defaultdict(int)
for group in self.group_leaders: for group in self.group_leaders:
for name, val in group.read().iteritems(): for name, val in group.read().iteritems():
ret[name] += val if name in self._fields:
ret[name] += val
return ret return ret
class DebugfsProvider(object): class DebugfsProvider(object):
def __init__(self): def __init__(self):
self._fields = walkdir(PATH_DEBUGFS_KVM)[2] self._fields = self.get_available_fields()
def get_available_fields(self):
return walkdir(PATH_DEBUGFS_KVM)[2]
@property @property
def fields(self): def fields(self):
@ -523,7 +533,8 @@ class Stats(object):
# also clear the cache of old values. # also clear the cache of old values.
self.values = {} self.values = {}
for provider in self.providers: for provider in self.providers:
provider_fields = [key for key in provider.fields if wanted(key)] provider_fields = [key for key in provider.get_available_fields()
if wanted(key)]
provider.fields = provider_fields provider.fields = provider_fields
@property @property
@ -555,7 +566,6 @@ class Tui(object):
self.stats = stats self.stats = stats
self.screen = None self.screen = None
self.drilldown = False self.drilldown = False
self.fields_filter = self.stats.fields_filter
self.update_drilldown() self.update_drilldown()
def __enter__(self): def __enter__(self):
@ -586,11 +596,11 @@ class Tui(object):
curses.endwin() curses.endwin()
def update_drilldown(self): def update_drilldown(self):
if not self.fields_filter: if not self.stats.fields_filter:
if self.drilldown: self.stats.fields_filter = r'^[^\(]*$'
self.stats.fields_filter = None
else: elif self.stats.fields_filter == r'^[^\(]*$':
self.stats.fields_filter = r'^[^\(]*$' self.stats.fields_filter = None
def refresh(self, sleeptime): def refresh(self, sleeptime):
self.screen.erase() self.screen.erase()