From: Florian Forster <octo@collectd.org>
Date: Wed, 10 Jan 2024 17:20:10 +0000 (+0100)
Subject: cpu plugin: Remove the special "global" case from `usage_ratio`.
X-Git-Tag: 6.0.0-rc0~5^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83a7070deb9b4a18812a2bfae9e3fd69c897bfc0;p=thirdparty%2Fcollectd.git

cpu plugin: Remove the special "global" case from `usage_ratio`.

This will just work transparently.
---

diff --git a/src/cpu.c b/src/cpu.c
index eed5eacb4..045bb45f3 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -543,21 +543,9 @@ static gauge_t usage_rate(usage_t *u, size_t cpu, state_t state) {
   return us.has_rate ? us.rate : NAN;
 }
 
-static gauge_t usage_global_ratio(usage_t *u, state_t state) {
-  usage_finalize(u);
-
-  gauge_t global_rate =
-      usage_global_rate(u, STATE_ACTIVE) + usage_global_rate(u, STATE_IDLE);
-  return usage_global_rate(u, state) / global_rate;
-}
-
 static gauge_t usage_ratio(usage_t *u, size_t cpu, state_t state) {
   usage_finalize(u);
 
-  if (cpu == CPU_ALL) {
-    return usage_global_ratio(u, state);
-  }
-
   gauge_t global_rate =
       usage_global_rate(u, STATE_ACTIVE) + usage_global_rate(u, STATE_IDLE);
   return usage_rate(u, cpu, state) / global_rate;