From patchwork Thu Nov 7 02:58:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh Bhagavatula X-Patchwork-Id: 62624 X-Patchwork-Delegate: david.marchand@redhat.com 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 A950CA04AB; Thu, 7 Nov 2019 03:59:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F3BE1E4EE; Thu, 7 Nov 2019 03:59:19 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 7D28B1E4EA for ; Thu, 7 Nov 2019 03:59:17 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xA72tiB3023034; Wed, 6 Nov 2019 18:59:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0818; bh=0yUD0IL8244GdLiKP6KcKENbO61qVAAVXMzIpGfXUos=; b=Uqt9VplnOo9VARCBcxwviSMUSBhmi+2Ni0qTQNXpj6KqyiURWK9LYcvYKGbCT94g9puQ 0bbN4eM3aXL6DRJ1A/0dMt3+JkfBkMXK1Ig2mGfGKd4fVkOrFNt5iWtw39uFfcNnNtdi rrb5QsJ0SRf9ASqcBFd3B9hE+dbGKXq0jq5CTCIs6Tef8xt9xrBXgMVudnl1CcMnMh0m M2oMVG2z7rrrK9Bu8w3azHEMsjMHllo/jBHHx/9c7PRV5ktM5m1iTVT6uauSdyFE977f 6jkpx8nQq8gYySwx1cXavmJVLLRLdohvnO4POUohios8wzNuxffOBw6PYZ9xz8dbjhRd Mg== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 2w46sarwsh-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2019 18:59:16 -0800 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 6 Nov 2019 18:59:15 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Wed, 6 Nov 2019 18:59:15 -0800 Received: from BG-LT7430.marvell.com (unknown [10.28.17.76]) by maili.marvell.com (Postfix) with ESMTP id 19BC03F703F; Wed, 6 Nov 2019 18:59:08 -0800 (PST) From: To: , Thomas Monjalon , "Ferruh Yigit" , Andrew Rybchenko , Konstantin Ananyev , Cristian Dumitrescu CC: , Pavan Nikhilesh Date: Thu, 7 Nov 2019 08:28:22 +0530 Message-ID: <20191107025823.5200-3-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191107025823.5200-1-pbhagavatula@marvell.com> References: <20191028090907.824-1-pbhagavatula@marvell.com> <20191107025823.5200-1-pbhagavatula@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-06_09:2019-11-06,2019-11-06 signatures=0 Subject: [dpdk-dev] [PATCH v2 3/3] lib: use RTE_DIM to calculate array size 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" From: Pavan Nikhilesh use RTE_DIM to calculate array size. Suggested-by: David Marchand Signed-off-by: Pavan Nikhilesh Acked-by: Cristian Dumitrescu --- lib/librte_ethdev/rte_ethdev.c | 8 +++----- lib/librte_ip_frag/ip_frag_internal.c | 5 ++--- lib/librte_port/rte_port_eventdev.c | 4 ++-- lib/librte_port/rte_port_eventdev.h | 4 ---- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 7743205d3..721ee694b 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -86,7 +86,7 @@ static const struct rte_eth_xstats_name_off rte_stats_strings[] = { rx_nombuf)}, }; -#define RTE_NB_STATS (sizeof(rte_stats_strings) / sizeof(rte_stats_strings[0])) +#define RTE_NB_STATS RTE_DIM(rte_stats_strings) static const struct rte_eth_xstats_name_off rte_rxq_stats_strings[] = { {"packets", offsetof(struct rte_eth_stats, q_ipackets)}, @@ -94,15 +94,13 @@ static const struct rte_eth_xstats_name_off rte_rxq_stats_strings[] = { {"errors", offsetof(struct rte_eth_stats, q_errors)}, }; -#define RTE_NB_RXQ_STATS (sizeof(rte_rxq_stats_strings) / \ - sizeof(rte_rxq_stats_strings[0])) +#define RTE_NB_RXQ_STATS RTE_DIM(rte_rxq_stats_strings) static const struct rte_eth_xstats_name_off rte_txq_stats_strings[] = { {"packets", offsetof(struct rte_eth_stats, q_opackets)}, {"bytes", offsetof(struct rte_eth_stats, q_obytes)}, }; -#define RTE_NB_TXQ_STATS (sizeof(rte_txq_stats_strings) / \ - sizeof(rte_txq_stats_strings[0])) +#define RTE_NB_TXQ_STATS RTE_DIM(rte_txq_stats_strings) #define RTE_RX_OFFLOAD_BIT2STR(_name) \ { DEV_RX_OFFLOAD_##_name, #_name } diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/librte_ip_frag/ip_frag_internal.c index 97470a872..b436a4c93 100644 --- a/lib/librte_ip_frag/ip_frag_internal.c +++ b/lib/librte_ip_frag/ip_frag_internal.c @@ -107,8 +107,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr, IP_LAST_FRAG_IDX : UINT32_MAX; /* this is the intermediate fragment. */ - } else if ((idx = fp->last_idx) < - sizeof (fp->frags) / sizeof (fp->frags[0])) { + } else if ((idx = fp->last_idx) < RTE_DIM(fp->frags)) { fp->last_idx++; } @@ -116,7 +115,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr, * erroneous packet: either exceed max allowed number of fragments, * or duplicate first/last fragment encountered. */ - if (idx >= sizeof (fp->frags) / sizeof (fp->frags[0])) { + if (idx >= RTE_DIM(fp->frags)) { /* report an error. */ if (fp->key.key_len == IPV4_KEYLEN) diff --git a/lib/librte_port/rte_port_eventdev.c b/lib/librte_port/rte_port_eventdev.c index aa93bd3a2..fd7dac9a5 100644 --- a/lib/librte_port/rte_port_eventdev.c +++ b/lib/librte_port/rte_port_eventdev.c @@ -179,7 +179,7 @@ rte_port_eventdev_writer_create(void *params, int socket_id) port->evt_op = conf->evt_op; memset(&port->ev, 0, sizeof(port->ev)); - for (i = 0; i < ARRAY_SIZE(port->ev); i++) { + for (i = 0; i < RTE_DIM(port->ev); i++) { port->ev[i].queue_id = port->queue_id; port->ev[i].sched_type = port->sched_type; port->ev[i].op = port->evt_op; @@ -386,7 +386,7 @@ rte_port_eventdev_writer_nodrop_create(void *params, int socket_id) port->evt_op = conf->evt_op; memset(&port->ev, 0, sizeof(port->ev)); - for (i = 0; i < ARRAY_SIZE(port->ev); i++) { + for (i = 0; i < RTE_DIM(port->ev); i++) { port->ev[i].queue_id = port->queue_id; port->ev[i].sched_type = port->sched_type; port->ev[i].op = port->evt_op; diff --git a/lib/librte_port/rte_port_eventdev.h b/lib/librte_port/rte_port_eventdev.h index acf88f4e9..966e9cdaf 100644 --- a/lib/librte_port/rte_port_eventdev.h +++ b/lib/librte_port/rte_port_eventdev.h @@ -9,10 +9,6 @@ extern "C" { #endif -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -#endif - /** * @file * RTE Port Eventdev Interface