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 14b52168e2ac7aacc76981d218239e847a178d29..c41f265fac9f79949db3025ad1316fb20b94c576 100644 (file)
--- 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 9620d2544424e6676af3a64d17522682306abaea..f162124a379c3701289b5ca757c6d9a0cc195b1a 100644 (file)
--- 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 2c3c96cf73b28d290d87a0b98f1ce6c61d85d475..eb7f2c917c52435410c3790eb96395b8d689d725 100644 (file)
--- 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 7b6f8a79e4bf8a0e5841205c0246b10917c47ff6..e7e3d861dd923a23640340ea7d58d1fb75c46e85 100644 (file)
--- 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;
 }