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

[WEBUI] Irix mode (per core instead of per CPU percentage) not togglable #3158

This commit is contained in:
nicolargo 2025-04-27 14:53:02 +02:00
parent 0bbb20a127
commit bfda524b4e
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/aoa/ps.rst
View File

@ -102,7 +102,8 @@ Columns display
``CPU%`` % of CPU used by the process
If Irix/Solaris mode is off ('0' key), the value
is divided by logical core number
is divided by logical core number (the column
name became CPUi)
``MEM%`` % of MEM used by the process (RES divided by
the total RAM you have)
``VIRT`` Virtual Memory Size

23
glances/outputs/static/js/components/plugin-processlist.vue
View File

@ -11,7 +11,7 @@
<div>
<span>CPU Min/Max/Mean: </span>
<span class="careful">{{ $filters.number(extended_stats.cpu_min, 1)
}}% / {{
}}% / {{
$filters.number(extended_stats.cpu_max, 1) }}% / {{ $filters.number(extended_stats.cpu_mean, 1)
}}%</span>
<span>Affinity: </span>
@ -64,7 +64,8 @@
@click="setExtendedStats(process)">
<td v-show="!getDisableStats().includes('cpu_percent')" scope="row"
:class="getCpuPercentAlert(process)">
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent, 1) }}
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent / process.irix, 1)
}}
</td>
<td v-show="!getDisableStats().includes('memory_percent')" scope="row"
:class="getMemoryPercentAlert(process)">
@ -150,7 +151,8 @@
@click="setExtendedStats(process.pid)">
<td v-show="!getDisableStats().includes('cpu_percent')" scope="row"
:class="getCpuPercentAlert(process)">
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent, 1) }}
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent / process.irix, 1)
}}
</td>
<td v-show="!getDisableStats().includes('memory_percent')" scope="row"
:class="getMemoryPercentAlert(process)">
@ -237,7 +239,8 @@
<tr v-for="(process, processId) in programs" :key="processId">
<td v-show="!getDisableStats().includes('cpu_percent')" scope="row"
:class="getCpuPercentAlert(process)">
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent, 1) }}
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent / process.irix, 1)
}}
</td>
<td v-show="!getDisableStats().includes('memory_percent')" scope="row"
:class="getMemoryPercentAlert(process)">
@ -321,7 +324,8 @@
<tr v-for="(process, processId) in programs" :key="processId">
<td v-show="!getDisableStats().includes('cpu_percent')" scope="row"
:class="getCpuPercentAlert(process)">
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent, 1) }}
{{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent / process.irix, 1)
}}
</td>
<td v-show="!getDisableStats().includes('memory_percent')" scope="row"
:class="getMemoryPercentAlert(process)">
@ -404,11 +408,11 @@ export default {
stats_processlist() {
return this.data.stats['processlist'];
},
stats_load() {
return this.data.stats['load'];
stats_core() {
return this.data.stats['core'];
},
cpucore() {
return this.stats_load['cpucore'];
return (this.stats_core['log'] !== 0) ? this.stats_core['log'] : 1;
},
extended_stats() {
return this.stats_processlist.find(item => item['extended_stats'] === true) || null;
@ -543,11 +547,12 @@ export default {
process.num_threads = -1;
}
process.irix = 1;
if (process.cpu_percent === null) {
process.cpu_percent = -1;
} else {
if (args.disable_irix) {
process.cpu_percent = process.cpu_percent / cpucore;
process.irix = cpucore
}
}

1
glances/outputs/static/package-lock.json generated
View File

@ -4,6 +4,7 @@
"requires": true,
"packages": {
"": {
"name": "static",
"dependencies": {
"bootstrap": "^5.3.5",
"favico.js": "^0.3.10",

2
glances/outputs/static/public/glances.js vendored
View File

File diff suppressed because one or more lines are too long

2
glances/plugins/processlist/__init__.py
View File

@ -709,7 +709,7 @@ class PluginModel(GlancesPluginModel):
if args.disable_irix and 0 < self.nb_log_core < 10:
msg = self.layout_header['cpu'].format('CPU%/' + str(self.nb_log_core))
elif args.disable_irix and self.nb_log_core != 0:
msg = self.layout_header['cpu'].format('CPU%/C')
msg = self.layout_header['cpu'].format('CPUi')
else:
msg = self.layout_header['cpu'].format('CPU%')
ret.append(self.curse_add_line(msg, sort_style if process_sort_key == 'cpu_percent' else 'DEFAULT'))