]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
cpu plugin: Remove the special "global" case from `usage_ratio`.
authorFlorian Forster <octo@collectd.org>
Wed, 10 Jan 2024 17:20:10 +0000 (18:20 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 22 Jan 2024 15:07:57 +0000 (16:07 +0100)
This will just work transparently.

src/cpu.c

index eed5eacb409044595949cb7a2833e5bc3af0f2a5..045bb45f3c0be607c6db823a04bab01e91d211c9 100644 (file)
--- 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;