From: Eero Tamminen <eero.t.tamminen@intel.com>
Date: Tue, 18 Oct 2022 16:02:59 +0000 (+0300)
Subject: gpu_sysman: Avoid log warning when ratio output is disabled
X-Git-Tag: 6.0.0-rc0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8923c0586b3c0319ad8743e778cd40eda4f34d45;p=thirdparty%2Fcollectd.git

gpu_sysman: Avoid log warning when ratio output is disabled

Fixes: 75aeab3a42b5

Signed-off-by: Eero Tamminen <eero.t.tamminen@intel.com>
---

diff --git a/src/gpu_sysman.c b/src/gpu_sysman.c
index 5f9cd1c77..ff1fd7fa9 100644
--- a/src/gpu_sysman.c
+++ b/src/gpu_sysman.c
@@ -988,7 +988,7 @@ static bool gpu_mems(gpu_device_t *gpu, unsigned int cache_idx) {
   };
   metric_t metric = {0};
 
-  bool ok = false;
+  bool reported_ratio = false, ok = false;
   for (i = 0; i < mem_count; i++) {
     /* fetch memory samples */
     if (zesMemoryGetState(mems[i], &(gpu->memory[cache_idx][i])) !=
@@ -1023,6 +1023,7 @@ static bool gpu_mems(gpu_device_t *gpu, unsigned int cache_idx) {
       if (config.output & OUTPUT_RATIO) {
         metric.value.gauge = mem_used / mem_size;
         metric_family_metric_append(&fam_ratio, metric);
+        reported_ratio = true;
       }
     } else {
       /* find min & max values for memory free from
@@ -1047,6 +1048,7 @@ static bool gpu_mems(gpu_device_t *gpu, unsigned int cache_idx) {
       if (config.output & OUTPUT_RATIO) {
         metric.value.gauge = mem_used / mem_size;
         metric_family_metric_append(&fam_ratio, metric);
+        reported_ratio = true;
       }
       /* smallest used amount of memory */
       mem_used = mem_size - free_min;
@@ -1056,13 +1058,16 @@ static bool gpu_mems(gpu_device_t *gpu, unsigned int cache_idx) {
       if (config.output & OUTPUT_RATIO) {
         metric.value.gauge = mem_used / mem_size;
         metric_family_metric_append(&fam_ratio, metric);
+        reported_ratio = true;
       }
     }
   }
   if (ok && cache_idx == 0) {
     metric_reset(&metric);
     gpu_submit(gpu, &fam_bytes);
-    gpu_submit(gpu, &fam_ratio);
+    if (reported_ratio) {
+      gpu_submit(gpu, &fam_ratio);
+    }
   }
   free(mems);
   return ok;