From: Ciara Power <ciara.power@intel.com>
Date: Fri, 22 May 2020 13:48:39 +0000 (+0100)
Subject: telemetry: fix init log printing
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;ds=sidebyside;h=61d6c7a98b48da02d905a45fa6314befcc567ff4;p=dpdk.git

telemetry: fix init log printing

Initially, printf was used to indicate and error/warning resulting from
telemetry initialisation. This is now fixed to use EAL logs for
notices, and the unnecessary printf for an error is removed.

Fixes: eeb486f3ba65 ("eal: add telemetry as dependency")
Fixes: dd6275a424ac ("telemetry: fix error log output")

Signed-off-by: Ciara Power <ciara.power@intel.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---

diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c
index 14b52168e2..c41f265fac 100644
--- a/lib/librte_eal/freebsd/eal.c
+++ b/lib/librte_eal/freebsd/eal.c
@@ -956,13 +956,15 @@ rte_eal_init(int argc, char **argv)
 		return -1;
 	}
 	if (!internal_config.no_telemetry) {
-		const char *error_str;
+		const char *error_str = NULL;
 		if (rte_telemetry_init(rte_eal_get_runtime_dir(),
 				&internal_config.ctrl_cpuset, &error_str)
 				!= 0) {
 			rte_eal_init_alert(error_str);
 			return -1;
 		}
+		if (error_str != NULL)
+			RTE_LOG(NOTICE, EAL, "%s\n", error_str);
 	}
 
 	eal_mcfg_complete();
diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
index 9620d25444..f162124a37 100644
--- a/lib/librte_eal/linux/eal.c
+++ b/lib/librte_eal/linux/eal.c
@@ -1294,13 +1294,15 @@ rte_eal_init(int argc, char **argv)
 		return -1;
 	}
 	if (!internal_config.no_telemetry) {
-		const char *error_str;
+		const char *error_str = NULL;
 		if (rte_telemetry_init(rte_eal_get_runtime_dir(),
 				&internal_config.ctrl_cpuset, &error_str)
 				!= 0) {
 			rte_eal_init_alert(error_str);
 			return -1;
 		}
+		if (error_str != NULL)
+			RTE_LOG(NOTICE, EAL, "%s\n", error_str);
 	}
 
 	eal_mcfg_complete();
diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h
index 2c3c96cf73..eb7f2c917c 100644
--- a/lib/librte_telemetry/rte_telemetry.h
+++ b/lib/librte_telemetry/rte_telemetry.h
@@ -241,8 +241,17 @@ int
 rte_telemetry_register_cmd(const char *cmd, telemetry_cb fn, const char *help);
 
 /**
+ * @internal
  * Initialize Telemetry.
  *
+ * @param runtime_dir
+ * The runtime directory of DPDK.
+ * @param cpuset
+ * The CPU set to be used for setting the thread affinity.
+ * @param err_str
+ * This err_str pointer should point to NULL on entry. In the case of an error
+ * or warning, it will be non-NULL on exit.
+ *
  * @return
  *  0 on success.
  * @return
diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c
index 7b6f8a79e4..e7e3d861dd 100644
--- a/lib/librte_telemetry/telemetry.c
+++ b/lib/librte_telemetry/telemetry.c
@@ -403,12 +403,10 @@ rte_telemetry_init(const char *runtime_dir, rte_cpuset_t *cpuset,
 {
 	if (telemetry_v2_init(runtime_dir, cpuset) != 0) {
 		*err_str = telemetry_log_error;
-		printf("Error initialising telemetry - %s\n", *err_str);
 		return -1;
 	}
 	if (telemetry_legacy_init(runtime_dir, cpuset) != 0) {
 		*err_str = telemetry_log_error;
-		printf("No telemetry legacy support - %s\n", *err_str);
 	}
 	return 0;
 }