From patchwork Fri Jan 24 04:55:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh Bhagavatula X-Patchwork-Id: 65110 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 D591CA052F; Fri, 24 Jan 2020 05:56:14 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D529E44C7; Fri, 24 Jan 2020 05:56:02 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id A28AC34F3 for ; Fri, 24 Jan 2020 05:56:00 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00O4kn0u028965; Thu, 23 Jan 2020 20:55:59 -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=g6lQunEc/BRnoYi8Qyj8dhubpkxrFfVd7N+GtuuNBAg=; b=vtl3rGzZexooyG6WnrN4dCnvwZmsQe4fk021gn2WFYnKiIBAg73VrZVAnSiR6N4KSETQ ioki8HQrutvQXdq3GZStoDsIpz06G7U7rIb6gOMcJBl/fhh/04HnlYSekSRjaA8iR+f6 8MMWUupD3BfMadjFabhhqy7K5eJQK46obP3SkkY2X3lK9K3WxGdwfmwAy4wdUNCu8s3f /zz6f8adEF8bowNrYZoBJZiJW8NddFGGC/HwQ3Xqzvrqb0kunWt6Cg62qY9U1sB+rmFw IqqCwTZUmKlvXM6OD3ec3Zwr+nUodD3P+AXQOILa+AgjoxTD6Z2gQGOP02LhppqbHoFM HA== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0a-0016f401.pphosted.com with ESMTP id 2xq4x4mr44-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 23 Jan 2020 20:55:59 -0800 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Jan 2020 20:55:58 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 23 Jan 2020 20:55:58 -0800 Received: from BG-LT7430.marvell.com (bg-lt7430.marvell.com [10.28.10.90]) by maili.marvell.com (Postfix) with ESMTP id 6C35B3F703F; Thu, 23 Jan 2020 20:55:56 -0800 (PST) From: To: Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Konstantin Ananyev , Cristian Dumitrescu , Kevin Laatz CC: , Pavan Nikhilesh Date: Fri, 24 Jan 2020 10:25:44 +0530 Message-ID: <20200124045545.3664-3-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200124045545.3664-1-pbhagavatula@marvell.com> References: <20191107025823.5200-1-pbhagavatula@marvell.com> <20200124045545.3664-1-pbhagavatula@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-01-23_13:2020-01-23, 2020-01-23 signatures=0 Subject: [dpdk-dev] [PATCH v3 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 Acked-by: Kevin Laatz --- 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 ---- lib/librte_telemetry/rte_telemetry_parser_test.c | 4 +--- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 9d62dc436..774c721b3 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 diff --git a/lib/librte_telemetry/rte_telemetry_parser_test.c b/lib/librte_telemetry/rte_telemetry_parser_test.c index 23ec7a77c..6164ef83e 100644 --- a/lib/librte_telemetry/rte_telemetry_parser_test.c +++ b/lib/librte_telemetry/rte_telemetry_parser_test.c @@ -463,10 +463,8 @@ rte_telemetry_parser_test(struct telemetry_impl *telemetry) }; -#define NUM_TEST_TYPES (sizeof(test_types)/sizeof(const char * const)) - uint32_t i; - for (i = 0; i < NUM_TEST_TYPES; i++) { + for (i = 0; i < RTE_DIM(test_types); i++) { TELEMETRY_LOG_INFO("%s", test_types[i]); ret = rte_telemetry_send_get_ports_and_stats_request(telemetry,