gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17565 from liviuconcioiu/monitor

Browse Source 
Fix system memory and system swap values on Windows

Fixes #17386
This commit is contained in:
Maurício Meneghini Fauth 2022-05-29 15:23:32 -03:00 committed by GitHub
commit 3e1834e144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/src/server/status/monitor.js
View File

@ -263,15 +263,15 @@ AJAX.registerOnload('server/status/monitor.js', function () {
'memory': {
title: Messages.strSystemMemory,
series: [{
label: Messages.strTotalMemory,
fill: true
}, {
dataType: 'memory',
label: Messages.strUsedMemory,
fill: true
}, {
label: Messages.strFreeMemory,
fill: true
}],
nodes: [{ dataPoints: [{ type: 'memory', name: 'MemTotal' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 }
nodes: [{ dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024 }
],
maxYLabel: 0
},
@ -279,14 +279,14 @@ AJAX.registerOnload('server/status/monitor.js', function () {
'swap': {
title: Messages.strSystemSwap,
series: [{
label: Messages.strTotalSwap,
fill: true
}, {
label: Messages.strUsedSwap,
fill: true
}, {
label: Messages.strFreeSwap,
fill: true
}],
nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapTotal' }] },
{ dataPoints: [{ type: 'memory', name: 'SwapUsed' }] }
nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024 }
],
maxYLabel: 0
}

3
libraries/classes/Server/SysInfo/WindowsNt.php
View File

@ -130,6 +130,7 @@ class WindowsNt extends Base
$buffer = $this->getWMI('Win32_PageFileUsage');
$mem['SwapTotal'] = 0;
$mem['SwapFree'] = 0;
$mem['SwapUsed'] = 0;
$mem['SwapPeak'] = 0;
@ -139,6 +140,8 @@ class WindowsNt extends Base
$mem['SwapPeak'] += $swapdevice['PeakUsage'] * 1024;
}
$mem['SwapFree'] = $mem['SwapTotal'] - $mem['SwapUsed'];
return $mem;
}
}