nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-25 00:23:41 +03:00
Code Issues Projects Releases Wiki Activity

Correct duplicate process numeber for kernel processes in AMPS (issue #1261)

Browse Source
This commit is contained in:
nicolargo 2018-06-02 17:10:11 +02:00
parent 8b3aaac72d
commit d9b3e73da8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glances/amps_list.py
View File

@ -113,13 +113,18 @@ class AmpsList(object):
continue continue
try: try:
# Search in both cmdline and name (for kernel thread, see #1261) # Search in both cmdline and name (for kernel thread, see #1261)
amps_list = [p for p in processlist for c in p['cmdline'] if re.search(v.regex(), c) is not None] amps_list = [p['pid'] for p in processlist
amps_list += [p for p in processlist if re.search(v.regex(), p['name']) is not None] for c in p['cmdline']
if ((re.search(v.regex(), c) is not None) or
(re.search(v.regex(), p['name']) is not None))]
amps_list = list(set(amps_list))
except (TypeError, KeyError): except (TypeError, KeyError):
continue continue
if len(amps_list) > 0: if len(amps_list) > 0:
# At least one process is matching the regex # At least one process is matching the regex
logger.debug("AMPS: {} process detected (PID={})".format(k, amps_list[0]['pid'])) logger.debug("AMPS: {} processes {} detected ({})".format(len(amps_list),
k,
amps_list))
# Call the AMP update method # Call the AMP update method
thread = threading.Thread(target=v.update_wrapper, args=[amps_list]) thread = threading.Thread(target=v.update_wrapper, args=[amps_list])
thread.start() thread.start()