scripts/kvm/kvm_stat: Introduce properties for providers

As previous commit authors used a mixture of setters/getters and
direct access to class variables consolidating them the python way
improved readability.

Properties allow us to assign a value to a class variable through a
setter without the need to call the setter ourselves.

Reviewed-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Message-Id: <1452525484-32309-19-git-send-email-frankja@linux.vnet.ibm.com>
[prop.setter is new in Python 2.6, which is the earliest supported
 version. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Janosch Frank 2016-01-11 16:17:48 +01:00 committed by Paolo Bonzini
parent 312bf62b7c
commit a90b87bf25

View File

@ -385,9 +385,7 @@ class TracepointProvider(object):
extra.append(f + '(' + name + ')') extra.append(f + '(' + name + ')')
fields += extra fields += extra
self._setup(fields) self._setup(fields)
self.select(fields) self.fields = fields
def fields(self):
return self._fields
def _setup(self, _fields): def _setup(self, _fields):
self._fields = _fields self._fields = _fields
@ -417,7 +415,14 @@ class TracepointProvider(object):
tracepoint=tracepoint, tracepoint=tracepoint,
tracefilter=tracefilter) tracefilter=tracefilter)
self.group_leaders.append(group) self.group_leaders.append(group)
def select(self, fields):
@property
def fields(self):
return self._fields
@fields.setter
def fields(self, fields):
self._fields = fields
for group in self.group_leaders: for group in self.group_leaders:
for event in group.events: for event in group.events:
if event.name in fields: if event.name in fields:
@ -425,6 +430,7 @@ class TracepointProvider(object):
event.enable() event.enable()
else: else:
event.disable() 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:
@ -435,10 +441,15 @@ class TracepointProvider(object):
class DebugfsProvider(object): class DebugfsProvider(object):
def __init__(self): def __init__(self):
self._fields = walkdir(PATH_DEBUGFS_KVM)[2] self._fields = walkdir(PATH_DEBUGFS_KVM)[2]
@property
def fields(self): def fields(self):
return self._fields return self._fields
def select(self, fields):
@fields.setter
def fields(self, fields):
self._fields = fields self._fields = fields
def read(self): def read(self):
def val(key): def val(key):
return int(file(PATH_DEBUGFS_KVM + '/' + key).read()) return int(file(PATH_DEBUGFS_KVM + '/' + key).read())
@ -456,17 +467,17 @@ class Stats:
return re.match(self.fields_filter, key) is not None return re.match(self.fields_filter, key) is not None
self.values = dict() self.values = dict()
for d in self.providers: for d in self.providers:
provider_fields = [key for key in d.fields() if wanted(key)] provider_fields = [key for key in d.fields if wanted(key)]
for key in provider_fields: for key in provider_fields:
self.values[key] = None self.values[key] = None
d.select(provider_fields) d.fields = provider_fields
def set_fields_filter(self, fields_filter): def set_fields_filter(self, fields_filter):
self.fields_filter = fields_filter self.fields_filter = fields_filter
self._update() self._update()
def get(self): def get(self):
for d in self.providers: for d in self.providers:
new = d.read() new = d.read()
for key in d.fields(): for key in d.fields:
oldval = self.values.get(key, (0, 0)) oldval = self.values.get(key, (0, 0))
newval = new[key] newval = new[key]
newdelta = None newdelta = None