From: Florian Forster <octo@collectd.org>
Date: Tue, 9 Jan 2024 12:05:50 +0000 (+0100)
Subject: cpu plugin: Add a `cpu_num` field to `usage_t`.
X-Git-Tag: 6.0.0-rc0~5^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92ccbacbc5a1ce8d901fb2ef489c83a1c8759424;p=thirdparty%2Fcollectd.git

cpu plugin: Add a `cpu_num` field to `usage_t`.
---

diff --git a/src/cpu.c b/src/cpu.c
index 3a20e0803..a044f25ad 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -142,6 +142,7 @@ typedef struct {
 typedef struct {
   cdtime_t time;
   cdtime_t interval;
+  size_t cpu_num;
   bool finalized;
 
   usage_state_t *states;
@@ -361,6 +362,7 @@ static int usage_init(usage_t *u, cdtime_t now) {
     u->interval = now - u->time;
   }
   u->time = now;
+  u->cpu_num = 0;
   u->finalized = false;
   for (size_t i = 0; i < u->states_num; i++) {
     u->states[i].rate = 0;
@@ -402,6 +404,10 @@ static int usage_record(usage_t *u, size_t cpu, state_t state, derive_t count) {
     return status;
   }
 
+  if (u->cpu_num < (cpu + 1)) {
+    u->cpu_num = cpu + 1;
+  }
+
   size_t index = (cpu * STATE_MAX) + state;
   assert(index < u->states_num);
   usage_state_t *us = u->states + index;