[dpdk-stable] patch 'app/testpmd: fix name of bitrate library in meson build' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 3b2b4518c2364813fee6b8cc3f4883766406d209 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 2 Sep 2020 17:24:27 +0100
Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build

[ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]

The bitrate library in DPDK is actually in a "bitratestats" directory,
so that is used by meson for the macro and library name.
Therefore, we need to update references to RTE_LIBRTE_BITRATE to
RTE_LIBRTE_BITRATESTATS in testpmd to have it found. Rather than
supporting both defines, since make is being removed, we can just
replace all instances of the former define with the latter.

To ensure testpmd links ok when this is done, we also need to add
bitratestats to the list of library dependencies.

Fixes: 5b9656b157d3 ("lib: build with meson")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Tested-by: Wei Ling <weix.ling at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/meson.build  |  3 +++
 app/test-pmd/parameters.c |  4 ++--
 app/test-pmd/testpmd.c    | 12 ++++++------
 app/test-pmd/testpmd.h    |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 6006c60f99..93235c8192 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -25,6 +25,9 @@ sources = files('cmdline.c',
 	'util.c')
 
 deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
+if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS')
+	deps += 'bitratestats'
+endif
 if dpdk_conf.has('RTE_LIBRTE_PDUMP')
 	deps += 'pdump'
 endif
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 0eb7844783..b0f81641ed 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -604,7 +604,7 @@ launch_args_parse(int argc, char** argv)
 #ifdef RTE_LIBRTE_LATENCY_STATS
 		{ "latencystats",               1, 0, 0 },
 #endif
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 		{ "bitrate-stats",              1, 0, 0 },
 #endif
 		{ "disable-crc-strip",          0, 0, 0 },
@@ -972,7 +972,7 @@ launch_args_parse(int argc, char** argv)
 						 " must be >= 0\n", n);
 			}
 #endif
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 			if (!strcmp(lgopts[opt_idx].name, "bitrate-stats")) {
 				n = atoi(optarg);
 				if (n >= 0) {
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 8d3b7b2a3b..7f59cb02d1 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -54,7 +54,7 @@
 #endif
 #include <rte_flow.h>
 #include <rte_metrics.h>
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 #include <rte_bitrate.h>
 #endif
 #ifdef RTE_LIBRTE_LATENCY_STATS
@@ -471,7 +471,7 @@ uint8_t xstats_hide_zero;
 unsigned int num_sockets = 0;
 unsigned int socket_ids[RTE_MAX_NUMA_NODES];
 
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 /* Bitrate statistics */
 struct rte_stats_bitrates *bitrate_data;
 lcoreid_t bitrate_lcore_id;
@@ -1970,7 +1970,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
 	struct fwd_stream **fsm;
 	streamid_t nb_fs;
 	streamid_t sm_id;
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 	uint64_t tics_per_1sec;
 	uint64_t tics_datum;
 	uint64_t tics_current;
@@ -1985,7 +1985,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
 	do {
 		for (sm_id = 0; sm_id < nb_fs; sm_id++)
 			(*pkt_fwd)(fsm[sm_id]);
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 		if (bitrate_enabled != 0 &&
 				bitrate_lcore_id == rte_lcore_id()) {
 			tics_current = rte_rdtsc();
@@ -3609,7 +3609,7 @@ main(int argc, char** argv)
 			 "Check the core mask argument\n");
 
 	/* Bitrate/latency stats disabled by default */
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 	bitrate_enabled = 0;
 #endif
 #ifdef RTE_LIBRTE_LATENCY_STATS
@@ -3703,7 +3703,7 @@ main(int argc, char** argv)
 #endif
 
 	/* Setup bitrate stats */
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 	if (bitrate_enabled != 0) {
 		bitrate_data = rte_stats_bitrate_create();
 		if (bitrate_data == NULL)
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 2b1e9a24f9..82837d6f83 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -416,7 +416,7 @@ extern uint8_t latencystats_enabled;
 extern lcoreid_t latencystats_lcore_id;
 #endif
 
-#ifdef RTE_LIBRTE_BITRATE
+#ifdef RTE_LIBRTE_BITRATESTATS
 extern lcoreid_t bitrate_lcore_id;
 extern uint8_t bitrate_enabled;
 #endif
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.973333668 +0000
+++ 0038-app-testpmd-fix-name-of-bitrate-library-in-meson-bui.patch	2020-10-28 10:35:11.488829788 +0000
@@ -1,8 +1,10 @@
-From 54f89e3df4b16e9079c9d343870d16757429b68b Mon Sep 17 00:00:00 2001
+From 3b2b4518c2364813fee6b8cc3f4883766406d209 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Wed, 2 Sep 2020 17:24:27 +0100
 Subject: [PATCH] app/testpmd: fix name of bitrate library in meson build
 
+[ upstream commit 54f89e3df4b16e9079c9d343870d16757429b68b ]
+
 The bitrate library in DPDK is actually in a "bitratestats" directory,
 so that is used by meson for the macro and library name.
 Therefore, we need to update references to RTE_LIBRTE_BITRATE to
@@ -14,7 +16,6 @@
 bitratestats to the list of library dependencies.
 
 Fixes: 5b9656b157d3 ("lib: build with meson")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Tested-by: Wei Ling <weix.ling at intel.com>
@@ -27,10 +28,10 @@
  4 files changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
-index ea56e547bb..f52ab148f6 100644
+index 6006c60f99..93235c8192 100644
 --- a/app/test-pmd/meson.build
 +++ b/app/test-pmd/meson.build
-@@ -25,6 +25,9 @@ sources = files('5tswap.c',
+@@ -25,6 +25,9 @@ sources = files('cmdline.c',
  	'util.c')
  
  deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
@@ -41,10 +42,10 @@
  	deps += 'pdump'
  endif
 diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
-index 784515314e..8c2aa13dd3 100644
+index 0eb7844783..b0f81641ed 100644
 --- a/app/test-pmd/parameters.c
 +++ b/app/test-pmd/parameters.c
-@@ -616,7 +616,7 @@ launch_args_parse(int argc, char** argv)
+@@ -604,7 +604,7 @@ launch_args_parse(int argc, char** argv)
  #ifdef RTE_LIBRTE_LATENCY_STATS
  		{ "latencystats",               1, 0, 0 },
  #endif
@@ -53,7 +54,7 @@
  		{ "bitrate-stats",              1, 0, 0 },
  #endif
  		{ "disable-crc-strip",          0, 0, 0 },
-@@ -991,7 +991,7 @@ launch_args_parse(int argc, char** argv)
+@@ -972,7 +972,7 @@ launch_args_parse(int argc, char** argv)
  						 " must be >= 0\n", n);
  			}
  #endif
@@ -63,7 +64,7 @@
  				n = atoi(optarg);
  				if (n >= 0) {
 diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
-index fb286b86e5..ee3dd27d81 100644
+index 8d3b7b2a3b..7f59cb02d1 100644
 --- a/app/test-pmd/testpmd.c
 +++ b/app/test-pmd/testpmd.c
 @@ -54,7 +54,7 @@
@@ -75,7 +76,7 @@
  #include <rte_bitrate.h>
  #endif
  #ifdef RTE_LIBRTE_LATENCY_STATS
-@@ -488,7 +488,7 @@ uint8_t record_burst_stats;
+@@ -471,7 +471,7 @@ uint8_t xstats_hide_zero;
  unsigned int num_sockets = 0;
  unsigned int socket_ids[RTE_MAX_NUMA_NODES];
  
@@ -84,7 +85,7 @@
  /* Bitrate statistics */
  struct rte_stats_bitrates *bitrate_data;
  lcoreid_t bitrate_lcore_id;
-@@ -2064,7 +2064,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
+@@ -1970,7 +1970,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
  	struct fwd_stream **fsm;
  	streamid_t nb_fs;
  	streamid_t sm_id;
@@ -93,7 +94,7 @@
  	uint64_t tics_per_1sec;
  	uint64_t tics_datum;
  	uint64_t tics_current;
-@@ -2079,7 +2079,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
+@@ -1985,7 +1985,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
  	do {
  		for (sm_id = 0; sm_id < nb_fs; sm_id++)
  			(*pkt_fwd)(fsm[sm_id]);
@@ -102,7 +103,7 @@
  		if (bitrate_enabled != 0 &&
  				bitrate_lcore_id == rte_lcore_id()) {
  			tics_current = rte_rdtsc();
-@@ -3707,7 +3707,7 @@ main(int argc, char** argv)
+@@ -3609,7 +3609,7 @@ main(int argc, char** argv)
  			 "Check the core mask argument\n");
  
  	/* Bitrate/latency stats disabled by default */
@@ -111,7 +112,7 @@
  	bitrate_enabled = 0;
  #endif
  #ifdef RTE_LIBRTE_LATENCY_STATS
-@@ -3801,7 +3801,7 @@ main(int argc, char** argv)
+@@ -3703,7 +3703,7 @@ main(int argc, char** argv)
  #endif
  
  	/* Setup bitrate stats */
@@ -121,10 +122,10 @@
  		bitrate_data = rte_stats_bitrate_create();
  		if (bitrate_data == NULL)
 diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
-index a8ae5cceb1..f139fe7a0a 100644
+index 2b1e9a24f9..82837d6f83 100644
 --- a/app/test-pmd/testpmd.h
 +++ b/app/test-pmd/testpmd.h
-@@ -403,7 +403,7 @@ extern uint8_t latencystats_enabled;
+@@ -416,7 +416,7 @@ extern uint8_t latencystats_enabled;
  extern lcoreid_t latencystats_lcore_id;
  #endif