scripts/kvm/kvm_stat: Cleanup of Stats class

Converted class definition to new style and renamed improper named
variables.

Introduced property for fields_filter.

Moved member variable declaration to init, so one can see all class
variables when reading the init method.

Completely clear the values dict, as we don't need to keep single values.

Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Message-Id: <1452525484-32309-23-git-send-email-frankja@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

scripts/kvm/kvm_stat

@@ -472,31 +472,41 @@ class DebugfsProvider(object):
             return int(file(PATH_DEBUGFS_KVM + '/' + key).read())
         return dict([(key, val(key)) for key in self._fields])
 
-class Stats:
+class Stats(object):
     def __init__(self, providers, fields=None):
         self.providers = providers
-        self.fields_filter = fields
+        self._fields_filter = fields
-        self._update()
+        self.values = {}
-    def _update(self):
+        self.update_provider_filters()
+
+    def update_provider_filters(self):
         def wanted(key):
-            if not self.fields_filter:
+            if not self._fields_filter:
                 return True
-            return re.match(self.fields_filter, key) is not None
+            return re.match(self._fields_filter, key) is not None
-        self.values = dict()
+
-        for d in self.providers:
+        # As we reset the counters when updating the fields we can
-            provider_fields = [key for key in d.fields if wanted(key)]
+        # also clear the cache of old values.
-            for key in provider_fields:
+        self.values = {}
-                self.values[key] = None
+        for provider in self.providers:
-            d.fields = provider_fields
+            provider_fields = [key for key in provider.fields if wanted(key)]
-    def set_fields_filter(self, fields_filter):
+            provider.fields = provider_fields
-        self.fields_filter = fields_filter
+
-        self._update()
+    @property
+    def fields_filter(self):
+        return self._fields_filter
+
+    @fields_filter.setter
+    def fields_filter(self, fields_filter):
+        self._fields_filter = fields_filter
+        self.update_provider_filters()
+
     def get(self):
-        for d in self.providers:
+        for provider in self.providers:
-            new = d.read()
+            new = provider.read()
-            for key in d.fields:
+            for key in provider.fields:
                 oldval = self.values.get(key, (0, 0))
-                newval = new[key]
+                newval = new.get(key, 0)
                 newdelta = None
                 if oldval is not None:
                     newdelta = newval - oldval[0]
@@ -514,9 +524,9 @@ def tui(screen, stats):
     def update_drilldown():
         if not fields_filter:
             if drilldown:
-                stats.set_fields_filter(None)
+                stats.fields_filter = None
             else:
-                stats.set_fields_filter(r'^[^\(]*$')
+                stats.fields_filter = r'^[^\(]*$'
     update_drilldown()
     def refresh(sleeptime):
         screen.erase()