From patchwork Fri May 22 13:48:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 70529 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3CF96A0350; Fri, 22 May 2020 15:51:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 997D21D9AB; Fri, 22 May 2020 15:51:41 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id ACCFB1D9A3 for ; Fri, 22 May 2020 15:51:40 +0200 (CEST) IronPort-SDR: B97Dazvvlribld6jLGZHkmiX9lfX3lVAhrPrJEoLLsiFzRzx9aY+8k2UdYhY31lGviyHOSXkXV 3HbDE5rBSTUQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2020 06:51:39 -0700 IronPort-SDR: YAgG+OQpePfU1c1DFaPB4AoQLWzktY3aC23+QgHrgxFg1RLTnMxH7/JFw30GCr4kuDB5xrIYKi S/QdGvKDdamw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,421,1583222400"; d="scan'208";a="290115177" Received: from silpixa00399953.ir.intel.com (HELO silpixa00399953.ger.corp.intel.com) ([10.237.222.53]) by fmsmga004.fm.intel.com with ESMTP; 22 May 2020 06:51:37 -0700 From: Ciara Power To: kevin.laatz@intel.com Cc: dev@dpdk.org, jerinj@marvell.com, david.marchand@redhat.com, thomas@monjalon.net, bruce.richardson@intel.com, keith.wiles@intel.com, Ciara Power Date: Fri, 22 May 2020 14:48:39 +0100 Message-Id: <20200522134839.15911-1-ciara.power@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] telemetry: fix error and warning printfs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Initially, printf was used to indicate and error/warning resulting from telemetry initialisation. This is now fixed to use EAL logs for warnings, and the unnecessary printf for an error is removed. Fixes: eeb486f3ba65 ("eal: add telemetry as dependency") Fixes: dd6275a424ac ("telemetry: fix error log output") Cc: david.marchand@redhat.com Signed-off-by: Ciara Power Reviewed-by: Bruce Richardson --- lib/librte_eal/freebsd/eal.c | 4 +++- lib/librte_eal/linux/eal.c | 4 +++- lib/librte_telemetry/rte_telemetry.h | 9 +++++++++ lib/librte_telemetry/telemetry.c | 2 -- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c index 14b52168e..07456059e 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(WARNING, 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 9620d2544..10317a660 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(WARNING, 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 2c3c96cf7..eb7f2c917 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 7b6f8a79e..e7e3d861d 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; }