Fix sort by disk io in the web ui

This commit is contained in:
Floran Brutel
2020-11-20 18:48:00 +01:00
parent 566f55d7ae
commit 5fbcf94ca7
5 changed files with 12 additions and 21 deletions

View File

@@ -10,7 +10,7 @@ export default function GlancesPluginProcessController(ARGUMENTS, hotkeys) {
return !(column === 'username' || column === 'name');
},
getColumnLabel: function (column) {
if (_.isEqual(column, ['io_read', 'io_write'])) {
if (column === 'io_read' || column === 'io_write') {
return 'io_counters';
} else {
return column;

View File

@@ -37,35 +37,26 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats,
}
if (process.num_threads === null) {
process.num_threads = -1;
process.num_threads = -1;
}
if (process.cpu_percent === null) {
process.cpu_percent = -1;
process.cpu_percent = -1;
}
if (process.memory_percent === null) {
process.memory_percent = -1;
if (process.memory_percent === null) {
process.memory_percent = -1;
}
process.ioRead = null;
process.ioWrite = null;
process.io_read = null;
process.io_write = null;
if (process.io_counters) {
vm.ioReadWritePresent = true;
process.ioRead = (process.io_counters[0] - process.io_counters[2]) / process.time_since_update;
if (process.ioRead != 0) {
process.ioRead = $filter('bytes')(process.ioRead);
}
process.ioWrite = (process.io_counters[1] - process.io_counters[3]) / process.time_since_update;
if (process.ioWrite != 0) {
process.ioWrite = $filter('bytes')(process.ioWrite);
}
process.io_read = (process.io_counters[0] - process.io_counters[2]) / process.time_since_update;
process.io_write = (process.io_counters[1] - process.io_counters[3]) / process.time_since_update;
}
process.isNice = process.nice !== undefined && ((data.stats.isWindows && process.nice != 32) || (!data.stats.isWindows && process.nice != 0));
@@ -81,7 +72,7 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats,
if (data.isWindows && process.username !== null) {
process.username = _.last(process.username.split('\\'));
}
vm.processes.push(process);
}
}

View File

@@ -32,8 +32,8 @@
<div class="table-cell text-left hidden-xs hidden-sm">{{ process.num_threads == -1 ? '?' : process.num_threads }}</div>
<div class="table-cell" ng-class="{nice: process.isNice}">{{process.nice | exclamation}}</div>
<div class="table-cell" ng-class="{status: process.status == 'R'}">{{process.status}}</div>
<div class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.ioRead}}</div>
<div class="table-cell text-left hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.ioWrite}}</div>
<div class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.io_read | bytes}}</div>
<div class="table-cell text-left hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.io_write | bytes}}</div>
<div class="table-cell text-left" ng-show="vm.arguments.process_short_name">{{process.name}}</div>
<div class="table-cell text-left" ng-show="!vm.arguments.process_short_name">{{process.cmdline}}</div>
</div>

View File

Binary file not shown.

View File

Binary file not shown.