From e7a7add13a0cd2eb64f62502cad005a97d8e3ee2 Mon Sep 17 00:00:00 2001 From: Honnappa Nagarahalli Date: Wed, 23 Feb 2022 00:09:30 -0600 Subject: [PATCH] examples/l3fwd: share queue size variables nb_rxd and nb_txd are used in polling mode and event mode of operation. nb_rxd and nb_txd are already global in polling mode but are not visible to event mode code. Make them visible to all parts of the application. Signed-off-by: Honnappa Nagarahalli Reviewed-by: Kathleen Capella Reviewed-by: Ruifeng Wang Acked-by: Bruce Richardson Tested-by: Yingya Han < yingyax.han@intel.com> --- examples/l3fwd/l3fwd.h | 4 ++++ examples/l3fwd/l3fwd_event.c | 2 -- examples/l3fwd/main.c | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index 002510b851..ad39496e64 100644 --- a/examples/l3fwd/l3fwd.h +++ b/examples/l3fwd/l3fwd.h @@ -86,6 +86,10 @@ struct lcore_conf { extern volatile bool force_quit; +/* RX and TX queue depths */ +extern uint16_t nb_rxd; +extern uint16_t nb_txd; + /* ethernet addresses of ports */ extern uint64_t dest_eth_addr[RTE_MAX_ETHPORTS]; extern struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS]; diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c index dd9eafa9b9..7a401290f8 100644 --- a/examples/l3fwd/l3fwd_event.c +++ b/examples/l3fwd/l3fwd_event.c @@ -43,8 +43,6 @@ l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf) { struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc(); uint16_t nb_ports = rte_eth_dev_count_avail(); - uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT; - uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT; unsigned int nb_lcores = rte_lcore_count(); struct rte_eth_conf local_port_conf; struct rte_eth_dev_info dev_info; diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 05652a560a..a49f418796 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -53,9 +53,8 @@ #define MAX_LCORE_PARAMS 1024 -/* Static global variables used within this file. */ -static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT; -static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT; +uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT; +uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT; /**< Ports set in promiscuous mode off by default. */ static int promiscuous_on; -- 2.39.5