Merge pull request #1263 from notFloran/webui-threads

Add threads number in the process list of the webui
This commit is contained in:
Nicolas Hennion 2018-05-19 08:51:13 +02:00 committed by GitHub
commit 5302da3f4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5081 additions and 8367 deletions

View File

@ -7,15 +7,12 @@
<div class="table-cell hidden-xs hidden-sm">RES</div> <div class="table-cell hidden-xs hidden-sm">RES</div>
<div class="table-cell">PID</div> <div class="table-cell">PID</div>
<div sortable-th sorter="vm.sorter" column="username" class="table-cell text-left">USER</div> <div sortable-th sorter="vm.sorter" column="username" class="table-cell text-left">USER</div>
<div sortable-th sorter="vm.sorter" column="timemillis" class="table-cell hidden-xs hidden-sm">TIME+</div>
<div sortable-th sorter="vm.sorter" column="num_threads" class="table-cell hidden-xs hidden-sm">THR</div>
<div class="table-cell">NI</div> <div class="table-cell">NI</div>
<div class="table-cell">S</div> <div class="table-cell">S</div>
<div sortable-th sorter="vm.sorter" column="timemillis" class="table-cell hidden-xs hidden-sm">TIME+</div> <div sortable-th sorter="vm.sorter" column="io_read" class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">IOR/s</div>
<div sortable-th sorter="vm.sorter" column="io_read" class="table-cell hidden-xs hidden-sm" <div sortable-th sorter="vm.sorter" column="io_write" class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">IOW/s</div>
ng-show="vm.ioReadWritePresent">IOR/s
</div>
<div sortable-th sorter="vm.sorter" column="io_write" class="table-cell hidden-xs hidden-sm"
ng-show="vm.ioReadWritePresent">IOW/s
</div>
<div sortable-th sorter="vm.sorter" column="name" class="table-cell text-left">Command</div> <div sortable-th sorter="vm.sorter" column="name" class="table-cell text-left">Command</div>
</div> </div>
<div class="table-row" <div class="table-row"
@ -27,13 +24,14 @@
<div class="table-cell hidden-xs hidden-sm">{{process.memres | bytes}}</div> <div class="table-cell hidden-xs hidden-sm">{{process.memres | bytes}}</div>
<div class="table-cell">{{process.pid}}</div> <div class="table-cell">{{process.pid}}</div>
<div class="table-cell text-left">{{process.username}}</div> <div class="table-cell text-left">{{process.username}}</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"> <div class="table-cell hidden-xs hidden-sm">
<span ng-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span>{{ <span ng-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span>{{
process.timeplus.minutes | leftPad:2:'0' }}:{{ process.timeplus.seconds | leftPad:2:'0' }}<span process.timeplus.minutes | leftPad:2:'0' }}:{{ process.timeplus.seconds | leftPad:2:'0' }}<span
ng-show="process.timeplus.hours <= 0">.{{ process.timeplus.milliseconds | leftPad:2:'0' }}</span> ng-show="process.timeplus.hours <= 0">.{{ process.timeplus.milliseconds | leftPad:2:'0' }}</span>
</div> </div>
<div class="table-cell hidden-xs hidden-sm">{{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 hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.ioRead}}</div>
<div class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.ioWrite}}</div> <div class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">{{process.ioWrite}}</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.name}}</div>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long