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

Update docs

Browse Source
This commit is contained in:
nicolargo 2018-05-08 17:59:10 +02:00
parent 7f15c34206
commit 27c8c82933
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/aoa/ps.rst
View File

@ -63,6 +63,8 @@ Columns display
using (what's currently in the physical memory). using (what's currently in the physical memory).
``PID`` Process ID ``PID`` Process ID
``USER`` User ID ``USER`` User ID
``THR`` Threads number of the process
``TIME+`` Cumulative CPU time used by the process
``NI`` Nice level of the process ``NI`` Nice level of the process
``S`` Process status ``S`` Process status
@ -75,7 +77,6 @@ Columns display
- ``T``: traced/stopped by job control signal - ``T``: traced/stopped by job control signal
- ``X``: dead (should never be seen) - ``X``: dead (should never be seen)
``TIME+`` Cumulative CPU time used by the process
``R/s`` Per process I/O read rate in B/s ``R/s`` Per process I/O read rate in B/s
``W/s`` Per process I/O write rate in B/s ``W/s`` Per process I/O write rate in B/s
``COMMAND`` Process command line or command name ``COMMAND`` Process command line or command name

43
glances/plugins/glances_processlist.py
View File

@ -489,67 +489,72 @@ class Plugin(GlancesPlugin):
ret.append(self.curse_add_line(sep_char * 69)) ret.append(self.curse_add_line(sep_char * 69))
ret.append(self.curse_new_line()) ret.append(self.curse_new_line())
# CPU percent sum # CPU percent sum
msg = '{:>6.1f}'.format(self.__sum_stats('cpu_percent', mmm=mmm)) msg = self.layout_stat['cpu'].format(self.__sum_stats('cpu_percent', mmm=mmm))
ret.append(self.curse_add_line(msg, ret.append(self.curse_add_line(msg,
decoration=self.__mmm_deco(mmm))) decoration=self.__mmm_deco(mmm)))
# MEM percent sum # MEM percent sum
msg = '{:>6.1f}'.format(self.__sum_stats('memory_percent', mmm=mmm)) msg = self.layout_stat['mem'].format(self.__sum_stats('memory_percent', mmm=mmm))
ret.append(self.curse_add_line(msg, ret.append(self.curse_add_line(msg,
decoration=self.__mmm_deco(mmm))) decoration=self.__mmm_deco(mmm)))
# VIRT and RES memory sum # VIRT and RES memory sum
if 'memory_info' in self.stats[0] and self.stats[0]['memory_info'] is not None and self.stats[0]['memory_info'] != '': if 'memory_info' in self.stats[0] and self.stats[0]['memory_info'] is not None and self.stats[0]['memory_info'] != '':
# VMS # VMS
msg = '{:>6}'.format(self.auto_unit(self.__sum_stats('memory_info', indice=1, mmm=mmm), low_precision=False)) msg = self.layout_stat['virt'].format(self.auto_unit(self.__sum_stats('memory_info', indice=1, mmm=mmm), low_precision=False))
ret.append(self.curse_add_line(msg, ret.append(self.curse_add_line(msg,
decoration=self.__mmm_deco(mmm), decoration=self.__mmm_deco(mmm),
optional=True)) optional=True))
# RSS # RSS
msg = '{:>6}'.format(self.auto_unit(self.__sum_stats('memory_info', indice=0, mmm=mmm), low_precision=False)) msg = self.layout_stat['res'].format(self.auto_unit(self.__sum_stats('memory_info', indice=0, mmm=mmm), low_precision=False))
ret.append(self.curse_add_line(msg, ret.append(self.curse_add_line(msg,
decoration=self.__mmm_deco(mmm), decoration=self.__mmm_deco(mmm),
optional=True)) optional=True))
else: else:
msg = '{:>6}'.format('') msg = self.layout_header['virt'].format('')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = self.layout_header['res'].format('')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
# PID # PID
msg = '{:>6}'.format('') msg = self.layout_header['pid'].format('', width=self.__max_pid_size())
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
# USER # USER
msg = ' {:9}'.format('') msg = self.layout_header['user'].format('')
ret.append(self.curse_add_line(msg))
# NICE
msg = '{:>5}'.format('')
ret.append(self.curse_add_line(msg))
# STATUS
msg = '{:>2}'.format('')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
# TIME+ # TIME+
msg = '{:>10}'.format('') msg = self.layout_header['time'].format('')
ret.append(self.curse_add_line(msg, optional=True)) ret.append(self.curse_add_line(msg, optional=True))
# THREAD
msg = self.layout_header['thread'].format('')
ret.append(self.curse_add_line(msg))
# NICE
msg = self.layout_header['nice'].format('')
ret.append(self.curse_add_line(msg))
# STATUS
msg = self.layout_header['status'].format('')
ret.append(self.curse_add_line(msg))
# IO read/write # IO read/write
if 'io_counters' in self.stats[0] and mmm is None: if 'io_counters' in self.stats[0] and mmm is None:
# IO read # IO read
io_rs = int((self.__sum_stats('io_counters', 0) - self.__sum_stats('io_counters', indice=2, mmm=mmm)) / self.stats[0]['time_since_update']) io_rs = int((self.__sum_stats('io_counters', 0) - self.__sum_stats('io_counters', indice=2, mmm=mmm)) / self.stats[0]['time_since_update'])
if io_rs == 0: if io_rs == 0:
msg = '{:>6}'.format('0') msg = self.layout_stat['ior'].format('0')
else: else:
msg = '{:>6}'.format(self.auto_unit(io_rs, low_precision=True)) msg = self.layout_stat['ior'].format(self.auto_unit(io_rs, low_precision=True))
ret.append(self.curse_add_line(msg, ret.append(self.curse_add_line(msg,
decoration=self.__mmm_deco(mmm), decoration=self.__mmm_deco(mmm),
optional=True, additional=True)) optional=True, additional=True))
# IO write # IO write
io_ws = int((self.__sum_stats('io_counters', 1) - self.__sum_stats('io_counters', indice=3, mmm=mmm)) / self.stats[0]['time_since_update']) io_ws = int((self.__sum_stats('io_counters', 1) - self.__sum_stats('io_counters', indice=3, mmm=mmm)) / self.stats[0]['time_since_update'])
if io_ws == 0: if io_ws == 0:
msg = '{:>6}'.format('0') msg = self.layout_stat['iow'].format('0')
else: else:
msg = '{:>6}'.format(self.auto_unit(io_ws, low_precision=True)) msg = self.layout_stat['iow'].format(self.auto_unit(io_ws, low_precision=True))
ret.append(self.curse_add_line(msg, ret.append(self.curse_add_line(msg,
decoration=self.__mmm_deco(mmm), decoration=self.__mmm_deco(mmm),
optional=True, additional=True)) optional=True, additional=True))
else: else:
msg = '{:>6}'.format('') msg = self.layout_header['ior'].format('')
ret.append(self.curse_add_line(msg, optional=True, additional=True)) ret.append(self.curse_add_line(msg, optional=True, additional=True))
msg = self.layout_header['iow'].format('')
ret.append(self.curse_add_line(msg, optional=True, additional=True)) ret.append(self.curse_add_line(msg, optional=True, additional=True))
if mmm is None: if mmm is None:
msg = ' < {}'.format('current') msg = ' < {}'.format('current')