From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO3yW-0000EX-I3 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:48:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO3yV-00045h-7Y for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:48:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO3yV-00045U-0Q for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:48:03 -0500 From: Paolo Bonzini Date: Tue, 26 Jan 2016 14:46:56 +0100 Message-Id: <1453816041-36362-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1453816041-36362-1-git-send-email-pbonzini@redhat.com> References: <1453816041-36362-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 24/49] scripts/kvm/kvm_stat: Introduce properties for providers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Janosch Frank From: Janosch Frank 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 Signed-off-by: Janosch Frank 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 --- scripts/kvm/kvm_stat | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/kvm/kvm_stat b/scripts/kvm/kvm_stat index 66dfed6..c4e22d0 100755 --- a/scripts/kvm/kvm_stat +++ b/scripts/kvm/kvm_stat @@ -385,9 +385,7 @@ class TracepointProvider(object): extra.append(f + '(' + name + ')') fields += extra self._setup(fields) - self.select(fields) - def fields(self): - return self._fields + self.fields = fields def _setup(self, _fields): self._fields = _fields @@ -417,7 +415,14 @@ class TracepointProvider(object): tracepoint=tracepoint, tracefilter=tracefilter) 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 event in group.events: if event.name in fields: @@ -425,6 +430,7 @@ class TracepointProvider(object): event.enable() else: event.disable() + def read(self): ret = defaultdict(int) for group in self.group_leaders: @@ -435,10 +441,15 @@ class TracepointProvider(object): class DebugfsProvider(object): def __init__(self): self._fields = walkdir(PATH_DEBUGFS_KVM)[2] + + @property def fields(self): return self._fields - def select(self, fields): + + @fields.setter + def fields(self, fields): self._fields = fields + def read(self): def val(key): return int(file(PATH_DEBUGFS_KVM + '/' + key).read()) @@ -456,17 +467,17 @@ class Stats: return re.match(self.fields_filter, key) is not None self.values = dict() 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: self.values[key] = None - d.select(provider_fields) + d.fields = provider_fields def set_fields_filter(self, fields_filter): self.fields_filter = fields_filter self._update() def get(self): for d in self.providers: new = d.read() - for key in d.fields(): + for key in d.fields: oldval = self.values.get(key, (0, 0)) newval = new[key] newdelta = None -- 1.8.3.1