gpu_sysman: fix "Enabled metrics: none" logging

"none" could be logged erronously when "DisableEngine" is set.

Add test code for that (does not validate the log output, but
runs that and "no metrics + logging" cases so output can be
checked manually).

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

diff --git a/src/gpu_sysman.c b/src/gpu_sysman.c
index 7df99ff7f7d24c386e2aa473aad10c1190d22c3e..9b0fa76fd043fa1376069357d3f0cfc6dc3754da 100644 (file)
--- a/src/gpu_sysman.c
+++ b/src/gpu_sysman.c
@@ -280,6 +280,8 @@ static unsigned int list_gpu_metrics(const gpu_disable_t *disabled) {
     if (!disabled) {
       INFO("- none");
     }
+  }
+  if (config.gpuinfo) {
     INFO("Enabled metrics:");
   }
   unsigned int enabled = 0;
@@ -290,9 +292,9 @@ static unsigned int list_gpu_metrics(const gpu_disable_t *disabled) {
       }
       enabled++;
     }
-    if (config.gpuinfo && !enabled) {
-      INFO("- none");
-    }
+  }
+  if (config.gpuinfo && !enabled) {
+    INFO("- none");
   }
   return enabled;
 }

diff --git a/src/gpu_sysman_test.c b/src/gpu_sysman_test.c
index 4b9389b62e4e6893e6200cb8601fcc43c102af40..114a24be31f2b6acb04a6ea6cacaed2e5d7baf1b 100644 (file)
--- a/src/gpu_sysman_test.c
+++ b/src/gpu_sysman_test.c
@@ -1093,10 +1093,6 @@ static void plugin_register_free(void) {
  */
 static int test_config_keys(bool check_nonbool, bool enable_metrics,
                             bool enable_logs) {
-  struct {
-    bool set_false;
-    const char *prefix;
-  } bool_checks[] = {{enable_metrics, "Disable"}, {!enable_logs, "Log"}};
   /* tests for non-bool config keys */
   struct {
     const char *key;
@@ -1132,10 +1128,15 @@ static int test_config_keys(bool check_nonbool, bool enable_metrics,
   }
 
   /* make sure that also bool values work */
+  struct {
+    bool set_false;
+    const char *prefix;
+  } bool_checks[] = {{enable_metrics, "Disable"}, {!enable_logs, "Log"}};
+
   for (i = 0; i < registry.key_count; i++) {
 
     const char *prefix, *key = registry.keys[i];
-    for (j = 0; j < 2; j++) {
+    for (j = 0; j < STATIC_ARRAY_SIZE(bool_checks); j++) {
       prefix = bool_checks[j].prefix;
 
       if (strncmp(key, prefix, strlen(prefix))) {
@@ -1157,9 +1158,9 @@ static int test_config_keys(bool check_nonbool, bool enable_metrics,
 /* ------------------------------------------------------------------------- */
 
 /*
- * set all GPU metrics Disable* flags to 'value', update bitmask of
- * what was changed + set what's the full bitmask, and return count
- * of changed items
+ * set all GPU metric disable flags in 'disabled' to 'value', update
+ * bitmask of what was changed + set what's the full bitmask, and
+ * return count of changed items
  */
 static int get_reset_disabled(gpu_disable_t *disabled, bool value, int *mask,
                               int *all) {
@@ -1444,8 +1445,11 @@ int main(int argc, const char **argv) {
   globs.warnings = 0;
   assert(test_config_keys(true, true, true) == 0);
   assert(globs.warnings > 0);
-  /* more coverage by disabling only some of metrics at init */
   globs.warnings = 0;
+  assert(registry.init() == 0);
+  assert(registry.shutdown() == 0);
+  /* more coverage by disabling only some of metrics at init */
+  assert(registry.config("DisableEngine", "true") == 0);
   assert(registry.config("DisablePower", "true") == 0);
   /* for multi-sample init checks */
   assert(registry.config("Samples", "8") == 0);
@@ -1457,12 +1461,20 @@ int main(int argc, const char **argv) {
 
   /* init should fail when every metric is disabled */
   globs.warnings = 0;
-  fprintf(stderr, "All metrics & logs disabled + init/shutdown...\n");
+  fprintf(stderr,
+          "All metrics disabled + logs disabled&enabled + init/shutdown...\n");
   assert(test_config_keys(false, false, false) == 0);
   assert(registry.init() != 0);
   assert(globs.warnings > 0);
   /* undefined whether shutdown() returns fail or success after failed init */
   registry.shutdown();
+  /* all metrics disabled with GPU info enabled */
+  globs.warnings = 0;
+  assert(registry.config("LogGpuInfo", "true") == 0);
+  assert(registry.init() != 0);
+  assert(globs.warnings > 0);
+  /* undefined whether shutdown() returns fail or success after failed init */
+  registry.shutdown();
   fprintf(stderr, "metrics disabled init/shutdown: PASS\n\n");
 
   /* config tests done, re-enable metrics */