diff --git a/lib/OperatingSystems/FreeBSD.php b/lib/OperatingSystems/FreeBSD.php index c61d4234..ece7ef93 100644 --- a/lib/OperatingSystems/FreeBSD.php +++ b/lib/OperatingSystems/FreeBSD.php @@ -54,13 +54,13 @@ public function getMemory(): Memory { $result = preg_match_all($pattern, $swapinfo, $matches); if ($result === 1) { $data->setSwapTotal((int)($matches['Avail'][0] / 1024)); - $data->setSwapFree(($data->getSwapTotal() - (int)($matches['Used'][0]) / 1024)); + $data->setSwapFree(($data->getSwapTotal() - (int)($matches['Used'][0] / 1024))); } unset($matches, $result); try { - $meminfo = $this->executeCommand('/sbin/sysctl -n hw.physmem hw.pagesize vm.stats.vm.v_inactive_count vm.stats.vm.v_cache_count vm.stats.vm.v_free_count'); + $meminfo = $this->executeCommand('/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'); } catch (\RuntimeException $e) { $meminfo = ''; } diff --git a/tests/lib/FreeBSDTest.php b/tests/lib/FreeBSDTest.php index 29286cb6..671540a3 100644 --- a/tests/lib/FreeBSDTest.php +++ b/tests/lib/FreeBSDTest.php @@ -54,7 +54,7 @@ public function testGetMemory(): void { $this->os->method('executeCommand') ->willReturnMap([ ['/usr/sbin/swapinfo -k', file_get_contents(__DIR__ . '/../data/freebsd_swapinfo')], - ['/sbin/sysctl -n hw.physmem 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/freebsd_meminfo')], + ['/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/freebsd_meminfo')], ]); $memory = $this->os->getMemory(); @@ -72,7 +72,7 @@ public function testGetMemoryNoSwapinfo(): void { if ($command === '/usr/sbin/swapinfo -k') { throw new \RuntimeException('No output for command: /usr/sbin/swapinfo'); } - if ($command === '/sbin/sysctl -n hw.physmem hw.pagesize vm.stats.vm.v_inactive_count vm.stats.vm.v_cache_count vm.stats.vm.v_free_count') { + if ($command === '/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') { return file_get_contents(__DIR__ . '/../data/freebsd_meminfo'); } });