greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add secondary sort key for processes

pull/1269/head
nicolargo 2018-05-26 17:51:50 +02:00
parent c62d09f282
commit 53305cb110
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glances/processes.py
View File

@ -379,9 +379,12 @@ def sort_stats(stats, sortedby=None, reverse=True):
Reverse the sort if reverse is True. Reverse the sort if reverse is True.
""" """
sortedby_secondary = 'cpu_percent'
if sortedby is None: if sortedby is None:
# No need to sort... # No need to sort...
return stats return stats
elif sortedby is 'cpu_percent':
sortedby_secondary = 'memory_percent'
if sortedby == 'io_counters': if sortedby == 'io_counters':
# Specific case for io_counters # Specific case for io_counters
@ -393,12 +396,14 @@ def sort_stats(stats, sortedby=None, reverse=True):
process[sortedby][3], process[sortedby][3],
reverse=reverse) reverse=reverse)
except Exception: except Exception:
stats.sort(key=lambda x: weighted(x['cpu_percent']), stats.sort(key=lambda x:(weighted(x['cpu_percent']),
weighted(x['memory_percent'])),
reverse=reverse) reverse=reverse)
else: else:
# Others sorts # Others sorts
try: try:
stats.sort(key=lambda x: weighted(x[sortedby]), stats.sort(key=lambda x: (weighted(x[sortedby]),
weighted(x[sortedby_secondary])),
reverse=reverse) reverse=reverse)
except (KeyError, TypeError): except (KeyError, TypeError):
stats.sort(key=operator.itemgetter('name'), stats.sort(key=operator.itemgetter('name'),