nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2025-01-05 17:22:02 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/nicolargo/glances into develop

Browse Source
This commit is contained in:
nicolargo 2018-01-28 13:24:09 +01:00
commit 5fdedbf8cf
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glances/__init__.py
View File

@ -27,7 +27,7 @@ import signal
import sys
# Global name
__version__ = '3.0_DEV'
__version__ = '3.0.dev0'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPLv3'

23
glances/processes.py
View File

@ -230,21 +230,22 @@ class GlancesProcesses(object):
# Time since last update (for disk_io rate computation)
time_since_update = getTimeSinceLastUpdate('process_disk')
# Grab standards stats
######################
standards_attr = ['cmdline', 'cpu_percent', 'cpu_times',
'memory_info', 'memory_percent',
'name', 'nice', 'pid',
'ppid', 'status', 'username',
'status', 'num_threads', 'gids']
# Grab standard stats
#####################
standard_attrs = ['cmdline', 'cpu_percent', 'cpu_times', 'memory_info',
'memory_percent', 'name', 'nice', 'pid', 'ppid',
'status', 'username', 'status', 'num_threads']
# io_counters availability: Linux, BSD, Windows, AIX
if LINUX or BSD or WINDOWS:
standards_attr += ['io_counters']
if not MACOS and not SUNOS:
standard_attrs += ['io_counters']
# gids availability: Unix
if not WINDOWS:
standard_attrs += ['gids']
# and build the processes stats list
try:
# PsUtil 2.0 or higher
self.processlist = [p.info for p in psutil.process_iter(attrs=standards_attr,
self.processlist = [p.info for p in psutil.process_iter(attrs=standard_attrs,
ad_value=None)
# OS specifics processes filter
if not (BSD and p.info['name'] == 'idle') and
@ -256,7 +257,7 @@ class GlancesProcesses(object):
not (self._filter.is_filtered(p.info))]
except TypeError:
# Fallback for PsUtil 2.0
before_filter = [p.as_dict(attrs=standards_attr, ad_value=None) for p in psutil.process_iter()]
before_filter = [p.as_dict(attrs=standard_attrs, ad_value=None) for p in psutil.process_iter()]
self.processlist = [p for p in before_filter
# OS specifics processes filter
if not (BSD and p['name'] == 'idle') and