Commit 1c57e770 authored by Mario Hock's avatar Mario Hock
Browse files

Fix: import of calculate_cpu_times_percent

parent bd57d1c7
...@@ -23,6 +23,7 @@ from collections import namedtuple ...@@ -23,6 +23,7 @@ from collections import namedtuple
import helpers import helpers
import curses_display as ui import curses_display as ui
from logging import LoggingManager from logging import LoggingManager
from psutil_functions import calculate_cpu_times_percent
def get_time(): def get_time():
...@@ -91,7 +92,7 @@ class Measurement: ...@@ -91,7 +92,7 @@ class Measurement:
## calculate differences ## calculate differences
self.timespan = self.r2.timestamp - self.r1.timestamp self.timespan = self.r2.timestamp - self.r1.timestamp
self.cpu_times_percent = helpers.calculate_cpu_times_percent(self.r1.cpu_times, self.r2.cpu_times, percpu=True) self.cpu_times_percent = calculate_cpu_times_percent(self.r1.cpu_times, self.r2.cpu_times, percpu=True)
self.net_io = self._calculate_net_io() self.net_io = self._calculate_net_io()
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
# Author: Mario Hock # Author: Mario Hock
from collections import namedtuple
import os import os
import netifaces import netifaces
import operator import operator
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
# #
# Author: Mario Hock # Author: Mario Hock
import os
from collections import namedtuple
_ptime_cpu_perc_nt = None _ptime_cpu_perc_nt = None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment