d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

telemetry: fix init log printing

Browse Source 
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>
This commit is contained in:
Ciara Power 2020-05-22 14:48:39 +01:00 committed by Thomas Monjalon
parent dd8384a4f5
commit 61d6c7a98b
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librte_eal/freebsd/eal.c
View File

@ -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();

4
lib/librte_eal/linux/eal.c
View File

@ -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();

9
lib/librte_telemetry/rte_telemetry.h
View File

@ -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

2
lib/librte_telemetry/telemetry.c
View File

@ -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;
}