From patchwork Tue Jun 19 01:04:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 41243 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BAA132BAF; Tue, 19 Jun 2018 02:05:23 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 19B222BAF for ; Tue, 19 Jun 2018 02:05:21 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jun 2018 17:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,241,1526367600"; d="scan'208";a="60275251" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.212]) by orsmga003.jf.intel.com with ESMTP; 18 Jun 2018 17:05:19 -0700 From: Ferruh Yigit To: Thomas Monjalon Cc: dev@dpdk.org, Ferruh Yigit Date: Tue, 19 Jun 2018 02:04:55 +0100 Message-Id: <20180619010457.61490-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180514155648.81149-1-ferruh.yigit@intel.com> References: <20180514155648.81149-1-ferruh.yigit@intel.com> Subject: [dpdk-dev] [PATCH v4 1/3] ethdev: move log macro to header 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" Macro moved to header to be able to convert logging usage in header. And since it has been moved to public header changed naming and added RTE prefix, ethdev_log -> RTE_ETHDEV_LOG Also need to add logtype variable to map file since logging macro used from other libraries. Signed-off-by: Ferruh Yigit Reviewed-by: Andrew Rybchenko Acked-by: Shahaf Shuler --- v2: * updated commit log v3: no update v4: * rename logtype variable to rte_eth_dev_logtype * add logtype variable to .map file --- lib/librte_ethdev/rte_ethdev.c | 37 ++++++++++++------------ lib/librte_ethdev/rte_ethdev.h | 5 ++++ lib/librte_ethdev/rte_ethdev_version.map | 7 +++++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index a9977df97..2f696bfa9 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -42,10 +42,7 @@ #include "rte_ethdev_driver.h" #include "ethdev_profile.h" -static int ethdev_logtype; - -#define ethdev_log(level, fmt, ...) \ - rte_log(RTE_LOG_ ## level, ethdev_logtype, fmt "\n", ## __VA_ARGS__) +int rte_eth_dev_logtype; static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data"; struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS]; @@ -303,14 +300,16 @@ rte_eth_dev_allocate(const char *name) rte_spinlock_lock(&rte_eth_dev_shared_data->ownership_lock); if (_rte_eth_dev_allocated(name) != NULL) { - ethdev_log(ERR, "Ethernet device with name %s already allocated", - name); + RTE_ETHDEV_LOG(ERR, + "Ethernet device with name %s already allocated\n", + name); goto unlock; } port_id = rte_eth_dev_find_free_port(); if (port_id == RTE_MAX_ETHPORTS) { - ethdev_log(ERR, "Reached maximum number of Ethernet ports"); + RTE_ETHDEV_LOG(ERR, + "Reached maximum number of Ethernet ports\n"); goto unlock; } @@ -663,7 +662,7 @@ rte_eth_dev_attach(const char *devargs, uint16_t *port_id) /* no point looking at the port count if no port exists */ if (!rte_eth_dev_count_total()) { - ethdev_log(ERR, "No port found for device (%s)", da.name); + RTE_ETHDEV_LOG(ERR, "No port found for device (%s)\n", da.name); ret = -1; goto err; } @@ -698,8 +697,8 @@ rte_eth_dev_detach(uint16_t port_id, char *name __rte_unused) dev_flags = rte_eth_devices[port_id].data->dev_flags; if (dev_flags & RTE_ETH_DEV_BONDED_SLAVE) { - ethdev_log(ERR, - "Port %" PRIu16 " is bonded, cannot detach", port_id); + RTE_ETHDEV_LOG(ERR, + "Port %" PRIu16 " is bonded, cannot detach\n", port_id); return -ENOTSUP; } @@ -1164,7 +1163,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, /* Any requested offloading must be within its device capabilities */ if ((local_conf.rxmode.offloads & dev_info.rx_offload_capa) != local_conf.rxmode.offloads) { - ethdev_log(ERR, "ethdev port_id=%d requested Rx offloads " + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%d requested Rx offloads " "0x%" PRIx64 " doesn't match Rx offloads " "capabilities 0x%" PRIx64 " in %s()\n", port_id, @@ -1175,7 +1174,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, } if ((local_conf.txmode.offloads & dev_info.tx_offload_capa) != local_conf.txmode.offloads) { - ethdev_log(ERR, "ethdev port_id=%d requested Tx offloads " + RTE_ETHDEV_LOG(ERR, "ethdev port_id=%d requested Tx offloads " "0x%" PRIx64 " doesn't match Tx offloads " "capabilities 0x%" PRIx64 " in %s()\n", port_id, @@ -1572,7 +1571,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, */ if ((local_conf.offloads & dev_info.rx_queue_offload_capa) != local_conf.offloads) { - ethdev_log(ERR, "Ethdev port_id=%d rx_queue_id=%d, new " + RTE_ETHDEV_LOG(ERR, "Ethdev port_id=%d rx_queue_id=%d, new " "added offloads 0x%" PRIx64 " must be " "within pre-queue offload capabilities 0x%" PRIx64 " in %s()\n", @@ -1737,7 +1736,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, */ if ((local_conf.offloads & dev_info.tx_queue_offload_capa) != local_conf.offloads) { - ethdev_log(ERR, "Ethdev port_id=%d tx_queue_id=%d, new " + RTE_ETHDEV_LOG(ERR, "Ethdev port_id=%d tx_queue_id=%d, new " "added offloads 0x%" PRIx64 " must be " "within pre-queue offload capabilities 0x%" PRIx64 " in %s()\n", @@ -3343,7 +3342,7 @@ rte_eth_dev_callback_register(uint16_t port_id, return -EINVAL; if (!rte_eth_dev_is_valid_port(port_id) && port_id != RTE_ETH_ALL) { - ethdev_log(ERR, "Invalid port_id=%d", port_id); + RTE_ETHDEV_LOG(ERR, "Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -3406,7 +3405,7 @@ rte_eth_dev_callback_unregister(uint16_t port_id, return -EINVAL; if (!rte_eth_dev_is_valid_port(port_id) && port_id != RTE_ETH_ALL) { - ethdev_log(ERR, "Invalid port_id=%d", port_id); + RTE_ETHDEV_LOG(ERR, "Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -4522,7 +4521,7 @@ RTE_INIT(ethdev_init_log); static void ethdev_init_log(void) { - ethdev_logtype = rte_log_register("lib.ethdev"); - if (ethdev_logtype >= 0) - rte_log_set_level(ethdev_logtype, RTE_LOG_INFO); + rte_eth_dev_logtype = rte_log_register("lib.ethdev"); + if (rte_eth_dev_logtype >= 0) + rte_log_set_level(rte_eth_dev_logtype, RTE_LOG_INFO); } diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 36e3984ea..24f4b93b7 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -159,6 +159,11 @@ extern "C" { #include "rte_eth_ctrl.h" #include "rte_dev_info.h" +extern int rte_eth_dev_logtype; + +#define RTE_ETHDEV_LOG(level, ...) \ + rte_log(RTE_LOG_ ## level, rte_eth_dev_logtype, "" __VA_ARGS__) + struct rte_mbuf; /** diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map index 40cf42b8a..9a0d12d41 100644 --- a/lib/librte_ethdev/rte_ethdev_version.map +++ b/lib/librte_ethdev/rte_ethdev_version.map @@ -213,6 +213,13 @@ DPDK_18.05 { } DPDK_18.02; +DPDK_18.08 { + global: + + rte_eth_dev_logtype; + +} DPDK_18.05; + EXPERIMENTAL { global: