Merge pull request #431 from nextcloud/backport/427/stable25

[stable25] Fix FreeBSD: Add Support for Swap Output on TrueNas Core

Author: kesselb

lib/OperatingSystems/FreeBSD.php

@@ -41,12 +41,12 @@ public function getMemory(): Memory {
 		}
 
 		$matches = [];
-		$pattern = '/(?>\/dev\/\w+)\s+(?>\d+)\s+(?<Used>\d+)\s+(?<Avail>\d+)\s+(?<Capacity>\d+)/';
+		$pattern = '/(?>\/dev\/\S+)\s+(?>\d+)\s+(?<Used>\d+)\s+(?<Avail>\d+)\s+(?<Capacity>\d+)/';
 
 		$result = preg_match_all($pattern, $swapinfo, $matches);
-		if ($result === 1) {
-			$data->setSwapTotal((int)((int)$matches['Avail'][0] / 1024));
-			$data->setSwapFree(($data->getSwapTotal() - (int)((int)$matches['Used'][0] / 1024)));
+		if ($result !== 0) {
+			$data->setSwapTotal((int)((int)array_sum($matches['Avail']) / 1024));
+			$data->setSwapFree(($data->getSwapTotal() - (int)((int)array_sum($matches['Used']) / 1024)));
 		}
 
 		unset($matches, $result);

tests/data/truenas_core_meminfo

@@ -0,0 +1,5 @@
+137434759168
+4096
+5390734
+0
+1044334

tests/data/truenas_core_swapinfo

@@ -0,0 +1,7 @@
+Device          1K-blocks     Used    Avail Capacity
+/dev/mirror/swap0.eli   2097152        0  2097152     0%
+/dev/mirror/swap1.eli   2097152        0  2097152     0%
+/dev/mirror/swap2.eli   2097152        0  2097152     0%
+/dev/mirror/swap3.eli  16777216        0 16777216     0%
+/dev/mirror/swap4.eli   2097152        0  2097152     0%
+Total            25165824        0 25165824     0%

tests/lib/FreeBSDTest.php

@@ -96,6 +96,22 @@ public function testGetMemoryNoData(): void {
 		$this->assertEquals(new Memory(), $this->os->getMemory());
 	}
 
+	public function testGetMemoryTruenasSwapinfo(): void {
+		$this->os->method('executeCommand')
+			->willReturnMap([
+				['/usr/sbin/swapinfo -k', file_get_contents(__DIR__ . '/../data/truenas_core_swapinfo')],
+				['/sbin/sysctl -n hw.realmem hw.pagesize vm.stats.vm.v_inactive_count vm.stats.vm.v_cache_count vm.stats.vm.v_free_count', file_get_contents(__DIR__ . '/../data/truenas_core_meminfo')],
+			]);
+
+		$memory = $this->os->getMemory();
+
+		$this->assertEquals(131068, $memory->getMemTotal());
+		$this->assertEquals(-1, $memory->getMemFree());
+		$this->assertEquals(25136, $memory->getMemAvailable());
+		$this->assertEquals(24576, $memory->getSwapTotal());
+		$this->assertEquals(24576, $memory->getSwapFree());
+	}
+
 	public function testGetNetworkInterfaces(): void {
 		$this->os->method('executeCommand')
 			->willReturnCallback(static function ($command) {