From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH common] ProcFSTools: read_proc_stat: add more cpu stats from /proc/stat
Date: Tue, 27 Jul 2021 09:17:08 +0200 [thread overview]
Message-ID: <20210727071708.1405571-1-d.csapak@proxmox.com> (raw)
those fields might be interesting to users. At the moment, this is
only used in the external metrics export.
These fields exist in the kernel since:
* irq - 2.6.0
* softirq - 2.6.0
* steal - 2.6.11
* guest - 2.6.24
* guest_nice - 2.6.33
so they should all exist
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PVE/ProcFSTools.pm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm
index ff30e4b..8309ced 100644
--- a/src/PVE/ProcFSTools.pm
+++ b/src/PVE/ProcFSTools.pm
@@ -168,13 +168,18 @@ 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|) {
+ 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->{system} = $3;
$res->{idle} = $4;
$res->{used} = $1+$2+$3;
$res->{iowait} = $5;
+ $res->{irq} = $6 if defined($6);
+ $res->{softirq} = $7 if defined($7);
+ $res->{steal} = $8 if defined($8);
+ $res->{guest} = $9 if defined($9);
+ $res->{guest_nice} = $10 if defined($10);
} elsif ($line =~ m|^cpu\d+\s|) {
$cpucount++;
}
--
2.30.2
next reply other threads:[~2021-07-27 7:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 7:17 Dominik Csapak [this message]
2021-07-27 13:29 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210727071708.1405571-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox