Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CPUnetLOG
CPUnetLOG
Commits
1c57e770
Commit
1c57e770
authored
Oct 10, 2014
by
Mario Hock
Browse files
Fix: import of calculate_cpu_times_percent
parent
bd57d1c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
__init__.py
View file @
1c57e770
...
...
@@ -23,6 +23,7 @@ from collections import namedtuple
import
helpers
import
curses_display
as
ui
from
logging
import
LoggingManager
from
psutil_functions
import
calculate_cpu_times_percent
def
get_time
():
...
...
@@ -91,7 +92,7 @@ class Measurement:
## calculate differences
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
()
...
...
helpers.py
View file @
1c57e770
...
...
@@ -10,7 +10,6 @@
# Author: Mario Hock
from
collections
import
namedtuple
import
os
import
netifaces
import
operator
...
...
psutil_functions.py
View file @
1c57e770
...
...
@@ -18,6 +18,8 @@
#
# Author: Mario Hock
import
os
from
collections
import
namedtuple
_ptime_cpu_perc_nt
=
None
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment