diff options
Diffstat (limited to 'lib/OperatingSystems/DefaultOs.php')
| -rw-r--r-- | lib/OperatingSystems/DefaultOs.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/OperatingSystems/DefaultOs.php b/lib/OperatingSystems/DefaultOs.php index e69c7f7..0e2aa45 100644 --- a/lib/OperatingSystems/DefaultOs.php +++ b/lib/OperatingSystems/DefaultOs.php @@ -50,12 +50,8 @@ class DefaultOs implements IOperatingSystem { } foreach ($matches['Key'] as $i => $key) { - $value = (int)$matches['Value'][$i]; - $unit = $matches['Unit'][$i]; - - if ($unit === 'kB') { - $value *= 1024; - } + // Value is always in KB: https://github.com/torvalds/linux/blob/c70672d8d316ebd46ea447effadfe57ab7a30a50/fs/proc/meminfo.c#L58-L60 + $value = (int)($matches['Value'][$i] / 1024); switch ($key) { case 'MemTotal': @@ -195,7 +191,7 @@ class DefaultOs implements IOperatingSystem { $data = []; try { - $disks = $this->executeCommand('df -TP'); + $disks = $this->executeCommand('df -TPk'); } catch (\RuntimeException $e) { return $data; } @@ -216,8 +212,8 @@ class DefaultOs implements IOperatingSystem { $disk = new Disk(); $disk->setDevice($filesystem); $disk->setFs($matches['Type'][$i]); - $disk->setUsed((int)$matches['Used'][$i] * 1024); - $disk->setAvailable((int)$matches['Available'][$i] * 1024); + $disk->setUsed((int)($matches['Used'][$i] / 1024)); + $disk->setAvailable((int)($matches['Available'][$i] / 1024)); $disk->setPercent($matches['Capacity'][$i]); $disk->setMount($matches['Mounted'][$i]); |