From 2e8331ba22db97e439db8d73f0c1e5529a3c63b3 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Fri, 22 Apr 2022 09:17:48 +0200 Subject: [PATCH] proc fs tools: handle proc/stat without guest values PMG is often run as a container, and in certain environments (like Virtuozzo 7), the last two values (guest and guest_nice) might not be present. This led to a division by zero, because the total value was never updated. Reported in the community forum: https://forum.proxmox.com/threads/106896/ Acked-by: Wolfgang Bumiller Signed-off-by: Fabian Ebner --- src/PVE/ProcFSTools.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm index 88df5d2..d636427 100644 --- a/src/PVE/ProcFSTools.pm +++ b/src/PVE/ProcFSTools.pm @@ -168,9 +168,9 @@ sub read_proc_stat { if (my $fh = IO::File->new ("/proc/stat", "r")) { while (defined (my $line = <$fh>)) { - if ($line =~ m|^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)|) { - $res->{user} = $1 - $9; - $res->{nice} = $2 - $10; + if ($line =~ m|^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+)\s+(\d+))?|) { + $res->{user} = $1 - ($9 // 0); + $res->{nice} = $2 - ($10 // 0); $res->{system} = $3; $res->{idle} = $4; $res->{used} = $1+$2+$3+$6+$7+$8; @@ -178,8 +178,8 @@ sub read_proc_stat { $res->{irq} = $6; $res->{softirq} = $7; $res->{steal} = $8; - $res->{guest} = $9; - $res->{guest_nice} = $10; + $res->{guest} = $9 // 0; + $res->{guest_nice} = $10 // 0; } elsif ($line =~ m|^cpu\d+\s|) { $cpucount++; }