diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-28 15:41:49 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-28 15:41:49 -0400 |
| commit | 19d96f97d752ef481eec5f44b88aee0a6bbb8dcb (patch) | |
| tree | 29ff012d268389043b10fb806a4384c67d92c982 /scripts/profiling/util.py | |
| parent | da1a936af43962f4531eda51fa5834391f6745a1 (diff) | |
| parent | 20966f78951d734f100ed6a6a6feedd15dbe79e7 (diff) | |
Merge tag '0.7.2' into debian/experimental
Tag leap.soledad version 0.7.2
Diffstat (limited to 'scripts/profiling/util.py')
| -rw-r--r-- | scripts/profiling/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/profiling/util.py b/scripts/profiling/util.py index adf1de8c..e7e2ef9a 100644 --- a/scripts/profiling/util.py +++ b/scripts/profiling/util.py @@ -46,7 +46,7 @@ class StatsLogger(threading.Thread): stats = [] stats.append("%f" % (now - self._start)) # elapsed time stats.append("%f" % psutil.cpu_percent()) # total cpu - stats.append("%f" % psutil.phymem_usage().percent) # total memory + stats.append("%f" % psutil.virtual_memory().percent) # total memory return ' '.join(stats) def _make_proc_stats(self): |