Skip to content
Snippets Groups Projects
Commit 6ef7f46e authored by Roman Lacko's avatar Roman Lacko
Browse files

Fix division by zero in MemInfo when no swap is used

parent c72f2289
No related branches found
No related tags found
No related merge requests found
...@@ -19,8 +19,8 @@ sub new($class,%args) { ...@@ -19,8 +19,8 @@ sub new($class,%args) {
$self->{stopped} = 0; $self->{stopped} = 0;
$self->{refresh} = $args{-refresh}; $self->{refresh} = $args{-refresh};
$self->{unit} = $args{unit} // "MB"; $self->{unit} = $args{unit} // "MB";
$self->{prec} = $args{prec} // "%4d"; $self->{precision} = $args{precision} // "%4d";
$self->{display} = $args{display} // [ $self->{display} = $args{display} // [
{ {
icon => "", icon => "",
...@@ -81,7 +81,9 @@ sub populate_percent($self, $data) { ...@@ -81,7 +81,9 @@ sub populate_percent($self, $data) {
foreach my $rec (@$cookbook) { foreach my $rec (@$cookbook) {
my ($a, $b, $c) = @$rec; my ($a, $b, $c) = @$rec;
$data->{$a . $b . "Percent"} = int((100 * $data->{$a . $b}) / $data->{$a . $c}); $data->{$a . $b . "Percent"} = $data->{$a . $c}
? int((100 * $data->{$a . $b}) / $data->{$a . $c})
: "0";
} }
} }
...@@ -106,6 +108,8 @@ sub invoke($self) { ...@@ -106,6 +108,8 @@ sub invoke($self) {
if (defined($data{$var . "Unit"}) && ($data{$var . "Unit"} ne $self->{unit})) { if (defined($data{$var . "Unit"}) && ($data{$var . "Unit"} ne $self->{unit})) {
$val = int($val * $self->u($data{$var . "Unit"}) / $self->u($self->{unit})); $val = int($val * $self->u($data{$var . "Unit"}) / $self->u($self->{unit}));
} }
$val = sprintf($var =~ m/Percent$/ ? "%3d" : $self->{precision}, $val);
} }
$str =~ s/%\{$var\}/$val/g; $str =~ s/%\{$var\}/$val/g;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment