From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 98EA288B09 for ; Mon, 10 Jan 2022 05:53:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 90AB69416 for ; Mon, 10 Jan 2022 05:53:10 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 25DBE9298 for ; Mon, 10 Jan 2022 05:53:09 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id AF5D616ACB6; Mon, 10 Jan 2022 05:53:02 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 9D3C2156AFD; Mon, 10 Jan 2022 05:53:02 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 10 Jan 2022 05:52:58 +0100 Message-Id: <20220110045300.3668895-3-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220110045300.3668895-1-aderumier@odiso.com> References: <20220110045300.3668895-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.059 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-common 2/4] read_proc_stat: substract guest && guest_nice from user && nice time X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2022 04:53:40 -0000 user && nice time already include guest value https://github.com/torvalds/linux/blob/4ec9f7a18/kernel/sched/cputime.c#L151-L158 Other monitoring tools are already substracting theses guest values https://github.com/htop-dev/htop/blob/main/linux/LinuxProcessList.c https://github.com/influxdata/telegraf/blob/c66ccee46f47717c399ccc0348d17c95d11f477d/plugins/inputs/cpu/cpu.go --- src/PVE/ProcFSTools.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm index c816131..79d4a4c 100644 --- a/src/PVE/ProcFSTools.pm +++ b/src/PVE/ProcFSTools.pm @@ -169,8 +169,8 @@ 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; - $res->{nice} = $2; + $res->{user} = $1 - $9; + $res->{nice} = $2 - $10; $res->{system} = $3; $res->{idle} = $4; $res->{used} = $1+$2+$3; @@ -191,7 +191,7 @@ sub read_proc_stat { my $ctime = gettimeofday; # floating point time in seconds - # the sum of all (non-guest) fields + # the sum of all fields $res->{total} = $res->{user} + $res->{nice} + $res->{system} @@ -199,7 +199,9 @@ sub read_proc_stat { + $res->{irq} + $res->{softirq} + $res->{steal} - + $res->{idle}; + + $res->{idle} + + $res->{guest} + + $res->{guest_nice}; $res->{ctime} = $ctime; $res->{cpu} = 0; -- 2.30.2