vm stats: nearest int instead of truncation

Author: fepitre

qubes/app.py

@@ -354,7 +354,7 @@ def get_vm_stats(self, previous_time=None, previous=None, only_vm=None):
         """Measure cpu usage for all domains at once.
 
         If previous measurements are given, CPU usage will be given in
-        percents of time. Otherwise only absolute value (seconds).
+        percents of time. Otherwise, only absolute value (seconds).
 
         Return a tuple of (measurements_time, measurements),
         where measurements is a dictionary with key: domid, value: dict:
@@ -404,19 +404,21 @@ def get_vm_stats(self, previous_time=None, previous=None, only_vm=None):
             domid = vm['domid']
             current[domid] = {}
             current[domid]['memory_kb'] = vm['mem_kb']
-            current[domid]['cpu_time'] = int(vm['cpu_time'])
+            current[domid]['cpu_time'] = round(vm['cpu_time'])
             vcpus = max(vm['online_vcpus'], 1)
             if domid in previous:
-                current[domid]['cpu_usage_raw'] = int(
+                current[domid]['cpu_usage_raw'] = round(
                     (current[domid]['cpu_time'] - previous[domid]['cpu_time'])
-                    / 1000 ** 3 * 100 / (current_time - previous_time))
+                    / 1000 ** 3 * 100 / (current_time - previous_time)
+                )
                 if current[domid]['cpu_usage_raw'] < 0:
                     # VM has been rebooted
                     current[domid]['cpu_usage_raw'] = 0
             else:
                 current[domid]['cpu_usage_raw'] = 0
-            current[domid]['cpu_usage'] = \
-                int(current[domid]['cpu_usage_raw'] / vcpus)
+            current[domid]['cpu_usage'] = round(
+                current[domid]['cpu_usage_raw'] / vcpus
+            )
 
         return current_time, current
 

qubes/tests/app.py

@@ -119,20 +119,20 @@ def test_001_get_vm_stats_twice(self):
         expected_info = {
             0: {
                 'cpu_time': 243951379111104,
-                'cpu_usage': 9,
-                'cpu_usage_raw': 79,
+                'cpu_usage': 10,
+                'cpu_usage_raw': 80,
                 'memory_kb': 3733212,
             },
             1: {
                 'cpu_time': 2849496569205,
-                'cpu_usage': 99,
-                'cpu_usage_raw': 99,
+                'cpu_usage': 100,
+                'cpu_usage_raw': 100,
                 'memory_kb': 303916,
             },
             11: {
                 'cpu_time': 249658663079978,
                 'cpu_usage': 12,
-                'cpu_usage_raw': 99,
+                'cpu_usage_raw': 100,
                 'memory_kb': 3782668,
             },
         }