michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-26 16:10:29 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Handle FreeBSD vmstat output https://github.com/webmin/webmin/issues/498

Browse Source
This commit is contained in:
Jamie Cameron
2017-05-12 21:45:56 -07:00
parent 5a21764743
commit 4ffd3753a2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system-status/system-status-lib.pl
View File

@@ -73,18 +73,26 @@ my @drive = &get_current_drive_temps();
$info->{'drivetemps'} = \@drive if (@drive);
# IO input and output
if ($gconfig{'os_type'} =~ /-linux$/) {
if ($gconfig{'os_type'} =~ /-linux$/ || $gconfig{'os_type'} eq 'freebsd') {
my $out = &backquote_command("vmstat 1 2 2>/dev/null");
if (!$?) {
my @lines = split(/\r?\n/, $out);
my @w = split(/\s+/, $lines[$#lines]);
shift(@w) if ($w[0] eq '');
if ($w[8] =~ /^\d+$/ && $w[9] =~ /^\d+$/) {
# Blocks in and out
$info->{'io'} = [ $w[8], $w[9] ];
if ($gconfig{'os_type'} =~ /-linux$/) {
# Linux format
if ($w[8] =~ /^\d+$/ && $w[9] =~ /^\d+$/) {
# Blocks in and out
$info->{'io'} = [ $w[8], $w[9] ];
# CPU user, kernel, idle, io, vm
$info->{'cpu'} = [ @w[12..16] ];
# CPU user, kernel, idle, io, vm
$info->{'cpu'} = [ @w[12..16] ];
}
}
else {
# BSD format
# CPU user, kernel, idle
$info->{'cpu'} = [ $w[16], $w[17], $w[18], 0, 0 ];
}
}
}