From patchwork Thu Nov 24 20:31:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QWJkdWxsYWggw5ZtZXIgWWFtYcOn?= X-Patchwork-Id: 120141 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 848E2A00C3; Thu, 24 Nov 2022 21:31:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BA8040150; Thu, 24 Nov 2022 21:31:33 +0100 (CET) Received: from guvercin.ceng.metu.edu.tr (guvercin.ceng.metu.edu.tr [144.122.171.43]) by mails.dpdk.org (Postfix) with ESMTP id 7A3684014F for ; Thu, 24 Nov 2022 21:31:31 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by guvercin.ceng.metu.edu.tr (Postfix) with ESMTP id 07BB62CE67; Thu, 24 Nov 2022 23:31:31 +0300 (+03) X-Virus-Scanned: Debian amavisd-new at ceng.metu.edu.tr Received: from guvercin.ceng.metu.edu.tr ([127.0.0.1]) by localhost (guvercin.ceng.metu.edu.tr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iNHSlLOevWHs; Thu, 24 Nov 2022 23:31:27 +0300 (+03) Received: from dmu.otak.ist (unknown [212.156.37.190]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: e1885458) by guvercin.ceng.metu.edu.tr (Postfix) with ESMTPSA id 8F9582C670; Thu, 24 Nov 2022 23:31:26 +0300 (+03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ceng.metu.edu.tr; s=mail; t=1669321887; bh=DDgeyRpoVntdBKs2Vd9legAn/nAMq+nTu8757u4dTRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mf1C2LrhSMjFrgL2Yv3BS2sm92FoYLwPzQGaoFlvVvWq3oUAHAqXxxE8HHZ7SmMaT UwaFsGdLaxSN1yGM9jTRiwDrNIGdWg7m1Xw9J2DCG8qyFfBjbLSJ3VRk7GkoCfoEc5 GdS1qk802fgu4WKM2KgHfocLG5NKX2NtRSNOxH30= From: =?utf-8?b?QWJkdWxsYWggw5ZtZXIgWWFtYcOn?= To: dev@dpdk.org Cc: =?utf-8?b?QWJkdWxsYWggw5ZtZXIgWWFtYcOn?= , Thomas Monjalon Subject: [PATCH v7] examples/distributor: remove dead code and renaming Rx,Tx Date: Thu, 24 Nov 2022 23:31:24 +0300 Message-Id: <20221124203124.2253871-1-omer.yamac@ceng.metu.edu.tr> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221124202251.2239852-1-omer.yamac@ceng.metu.edu.tr> References: <20221124202251.2239852-1-omer.yamac@ceng.metu.edu.tr> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org One line of commented code was dead code, this line and related comments are removed. Naming of rx,RX and tx,TX are replaced by Rx and Tx. Signed-off-by: Abdullah Ömer Yamaç --- CC: Thomas Monjalon --- examples/distributor/main.c | 55 +++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/examples/distributor/main.c b/examples/distributor/main.c index 21304d6618..9280a2694e 100644 --- a/examples/distributor/main.c +++ b/examples/distributor/main.c @@ -104,7 +104,7 @@ struct output_buffer { static void print_stats(void); /* - * Initialises a given port using global settings and with the rx buffers + * Initialises a given port using global settings and with the Rx buffers * coming from the mbuf_pool passed as parameter */ static inline int @@ -259,12 +259,7 @@ lcore_rx(struct lcore_params *p) } app_stats.rx.rx_pkts += nb_rx; - /* - * Swap the following two lines if you want the rx traffic - * to go directly to tx, no distribution. - */ struct rte_ring *out_ring = p->rx_dist_ring; - /* struct rte_ring *out_ring = p->dist_tx_ring; */ uint16_t sent = rte_ring_enqueue_burst(out_ring, (void *)bufs, nb_rx, NULL); @@ -282,7 +277,7 @@ lcore_rx(struct lcore_params *p) } if (power_lib_initialised) rte_power_exit(rte_lcore_id()); - printf("\nCore %u exiting rx task.\n", rte_lcore_id()); + printf("\nCore %u exiting Rx task.\n", rte_lcore_id()); /* set distributor threads quit flag */ quit_signal_dist = 1; return 0; @@ -305,11 +300,11 @@ lcore_rx_and_distributor(struct lcore_params *p) if (rte_eth_dev_socket_id(port) > 0 && rte_eth_dev_socket_id(port) != socket_id) printf("WARNING, port %u is on remote NUMA node to " - "RX thread.\n\tPerformance will not " + "Rx thread.\n\tPerformance will not " "be optimal.\n", port); } - printf("\nCore %u doing packet RX and Distributor.\n", rte_lcore_id()); + printf("\nCore %u doing packet Rx and Distributor.\n", rte_lcore_id()); port = 0; while (!quit_signal_rx) { @@ -329,8 +324,8 @@ lcore_rx_and_distributor(struct lcore_params *p) app_stats.rx.rx_pkts += nb_rx; /* - * Run the distributor on the rx core. Returned - * packets are then send straight to the tx core. + * Run the distributor on the Rx core. Returned + * packets are then send straight to the Tx core. */ rte_distributor_process(d, bufs, nb_rx); const uint16_t nb_ret = rte_distributor_returned_pkts(d, @@ -360,8 +355,8 @@ lcore_rx_and_distributor(struct lcore_params *p) } if (power_lib_initialised) rte_power_exit(rte_lcore_id()); - printf("\nCore %u exiting rx task.\n", rte_lcore_id()); - /* set tx threads quit flag */ + printf("\nCore %u exiting Rx task.\n", rte_lcore_id()); + /* set Tx threads quit flag */ quit_signal = 1; /* set worker threads quit flag */ quit_signal_work = 1; @@ -448,7 +443,7 @@ lcore_distributor(struct lcore_params *p) if (power_lib_initialised) rte_power_exit(rte_lcore_id()); printf("\nCore %u exiting distributor task.\n", rte_lcore_id()); - /* set tx threads quit flag */ + /* set Tx threads quit flag */ quit_signal = 1; /* set worker threads quit flag */ quit_signal_work = 1; @@ -478,7 +473,7 @@ lcore_tx(struct rte_ring *in_r) "be optimal.\n", port); } - printf("\nCore %u doing packet TX.\n", rte_lcore_id()); + printf("\nCore %u doing packet Tx.\n", rte_lcore_id()); while (!quit_signal) { RTE_ETH_FOREACH_DEV(port) { @@ -524,7 +519,7 @@ lcore_tx(struct rte_ring *in_r) } if (power_lib_initialised) rte_power_exit(rte_lcore_id()); - printf("\nCore %u exiting tx task.\n", rte_lcore_id()); + printf("\nCore %u exiting Tx task.\n", rte_lcore_id()); return 0; } @@ -532,7 +527,7 @@ static void int_handler(int sig_num) { printf("Exiting on signal %d\n", sig_num); - /* set quit flag for rx thread to exit */ + /* set quit flag for Rx thread to exit */ quit_signal_rx = 1; } @@ -698,7 +693,7 @@ print_usage(const char *prgname) { printf("%s [EAL options] -- -p PORTMASK [-c]\n" " -p PORTMASK: hexadecimal bitmask of ports to configure\n" - " -c: Combines the RX core with the distribution core\n", + " -c: Combines the Rx core with the distribution core\n", prgname); } @@ -798,11 +793,11 @@ main(int argc, char *argv[]) rte_exit(EXIT_FAILURE, "Invalid distributor parameters\n"); if (enable_lcore_rx_distributor) { - /* RX and distributor combined, 3 fixed function cores (stat, TX, at least 1 worker) */ + /* Rx and distributor combined, 3 fixed function cores (stat, Tx, at least 1 worker) */ min_cores = 4; num_workers = rte_lcore_count() - 3; } else { - /* separate RX and distributor, 3 fixed function cores (stat, TX, at least 1 worker) */ + /* separate Rx and distributor, 3 fixed function cores (stat, Tx, at least 1 worker) */ min_cores = 5; num_workers = rte_lcore_count() - 4; } @@ -811,8 +806,8 @@ main(int argc, char *argv[]) rte_exit(EXIT_FAILURE, "Error, This application needs at " "least 4 logical cores to run:\n" "1 lcore for stats (can be core 0)\n" - "1 or 2 lcore for packet RX and distribution\n" - "1 lcore for packet TX\n" + "1 or 2 lcore for packet Rx and distribution\n" + "1 lcore for packet Tx\n" "and at least 1 lcore for worker threads\n"); if (init_power_library() == 0) @@ -875,13 +870,13 @@ main(int argc, char *argv[]) if (power_lib_initialised) { /* - * Here we'll pre-assign lcore ids to the rx, tx and + * Here we'll pre-assign lcore ids to the Rx, Tx and * distributor workloads if there's higher frequency * on those cores e.g. if Turbo Boost is enabled. * It's also worth mentioning that it will assign cores in a * specific order, so that if there's less than three * available, the higher frequency cores will go to the - * distributor first, then rx, then tx. + * distributor first, then Rx, then Tx. */ RTE_LCORE_FOREACH_WORKER(lcore_id) { @@ -939,18 +934,18 @@ main(int argc, char *argv[]) } if (enable_lcore_rx_distributor) - printf(" tx id %d, rx id %d\n", + printf(" Tx id %d, Rx id %d\n", tx_core_id, rx_core_id); else - printf(" tx id %d, dist id %d, rx id %d\n", + printf(" Tx id %d, dist id %d, Rx id %d\n", tx_core_id, distr_core_id, rx_core_id); /* * Kick off all the worker threads first, avoiding the pre-assigned - * lcore_ids for tx, rx and distributor workloads. + * lcore_ids for Tx, Rx and distributor workloads. */ RTE_LCORE_FOREACH_WORKER(lcore_id) { if (lcore_id == (unsigned int)distr_core_id || @@ -970,7 +965,7 @@ main(int argc, char *argv[]) p, lcore_id); } - /* Start tx core */ + /* Start Tx core */ rte_eal_remote_launch((lcore_function_t *)lcore_tx, dist_tx_ring, tx_core_id); @@ -978,7 +973,7 @@ main(int argc, char *argv[]) struct lcore_params *pd = NULL; if (!enable_lcore_rx_distributor) { pd = rte_malloc(NULL, sizeof(*pd), 0); - if (!pd) + if (pd == NULL) rte_panic("malloc failure\n"); *pd = (struct lcore_params){worker_id++, d, rx_dist_ring, dist_tx_ring, mbuf_pool}; @@ -986,7 +981,7 @@ main(int argc, char *argv[]) pd, distr_core_id); } - /* Start rx core */ + /* Start Rx core */ struct lcore_params *pr = rte_malloc(NULL, sizeof(*pr), 0); if (!pr)