From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIeFi-0001kz-Hs for qemu-devel@nongnu.org; Mon, 11 Jan 2016 10:19:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIeFf-0001vQ-LZ for qemu-devel@nongnu.org; Mon, 11 Jan 2016 10:19:26 -0500 Received: from e06smtp06.uk.ibm.com ([195.75.94.102]:59381) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIeFf-0001ui-DS for qemu-devel@nongnu.org; Mon, 11 Jan 2016 10:19:23 -0500 Received: from localhost by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 11 Jan 2016 15:19:22 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 651C52190023 for ; Mon, 11 Jan 2016 15:19:07 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0BFJIgb9109920 for ; Mon, 11 Jan 2016 15:19:18 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0BFJIfJ018821 for ; Mon, 11 Jan 2016 08:19:18 -0700 From: Janosch Frank Date: Mon, 11 Jan 2016 16:17:48 +0100 Message-Id: <1452525484-32309-19-git-send-email-frankja@linux.vnet.ibm.com> In-Reply-To: <1452525484-32309-1-git-send-email-frankja@linux.vnet.ibm.com> References: <1452525484-32309-1-git-send-email-frankja@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 18/34] scripts/kvm/kvm_stat: Introduce properties for providers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com Cc: frankja@linux.vnet.ibm.com, qemu-devel@nongnu.org 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 --- 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 -- 2.3.0