diff options
| -rw-r--r-- | .github/workflows/lint-and-analyse-php.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/other-tools.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/test-selenium.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/tests.yml | 2 | ||||
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | js/src/server/status/monitor.js | 18 | ||||
| -rw-r--r-- | libraries/classes/Server/SysInfo/WindowsNt.php | 3 |
7 files changed, 17 insertions, 13 deletions
diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml index cd70e3a165..6506101d08 100644 --- a/.github/workflows/lint-and-analyse-php.yml +++ b/.github/workflows/lint-and-analyse-php.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 12 diff --git a/.github/workflows/other-tools.yml b/.github/workflows/other-tools.yml index fb3e38eae7..d83c38803c 100644 --- a/.github/workflows/other-tools.yml +++ b/.github/workflows/other-tools.yml @@ -51,7 +51,7 @@ jobs: dependency-versions: highest - name: Set up Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 12 diff --git a/.github/workflows/test-selenium.yml b/.github/workflows/test-selenium.yml index 7d580b0aa9..a9b93c8248 100644 --- a/.github/workflows/test-selenium.yml +++ b/.github/workflows/test-selenium.yml @@ -104,7 +104,7 @@ jobs: dependency-versions: highest - name: Set up Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 12 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 99af0234a9..51d950fd8d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -193,7 +193,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: 12 @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - issue Fix blank page when some error occurs - issue #17519 Fix Export pages not working in certain conditions - issue #17496 Fix error in table operation page when partitions are broken +- issue #17386 Fix system memory and system swap values on Windows 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js index 7f0c4b0bae..18da3865d2 100644 --- a/js/src/server/status/monitor.js +++ b/js/src/server/status/monitor.js @@ -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, + label: Messages.strUsedSwap, fill: true }, { - label: Messages.strUsedSwap, + 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 } diff --git a/libraries/classes/Server/SysInfo/WindowsNt.php b/libraries/classes/Server/SysInfo/WindowsNt.php index 621d694d01..f16b3494a6 100644 --- a/libraries/classes/Server/SysInfo/WindowsNt.php +++ b/libraries/classes/Server/SysInfo/WindowsNt.php @@ -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; } } |