From patchwork Wed Sep 16 16:44:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 77915 X-Patchwork-Delegate: thomas@monjalon.net 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 56760A04B5; Wed, 16 Sep 2020 18:45:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D04271D17A; Wed, 16 Sep 2020 18:44:49 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id B217D1D161 for ; Wed, 16 Sep 2020 18:44:46 +0200 (CEST) IronPort-SDR: b8hPDgmkznLKyGdF+ma+U61WtPDYI26m8s/uMGlTk8lxbSBKgc4Qt1uvvL+usY2FGWSAiAYORh FKuQBczBNk2Q== X-IronPort-AV: E=McAfee;i="6000,8403,9746"; a="160441970" X-IronPort-AV: E=Sophos;i="5.76,433,1592895600"; d="scan'208";a="160441970" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 09:44:46 -0700 IronPort-SDR: f/qY42nRuYQHvMFzXX7+j2bN80k3gJnTAqTuWzwxTlfhdHyY9kObMIhLKcu/gd9ngfD893/+rl buI06RRNSD0w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,433,1592895600"; d="scan'208";a="483381457" Received: from silpixa00399126.ir.intel.com ([10.237.222.27]) by orsmga005.jf.intel.com with ESMTP; 16 Sep 2020 09:44:45 -0700 From: Bruce Richardson To: david.marchand@redhat.com Cc: dev@dpdk.org, Bruce Richardson Date: Wed, 16 Sep 2020 17:44:29 +0100 Message-Id: <20200916164429.244847-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200916164429.244847-1-bruce.richardson@intel.com> References: <20200916164429.244847-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC PATCH 5/5] build: replace use of old build macros 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" Use the newer macros defined by meson in all DPDK source code, to ensure there are no errors when the old non-standard macros are removed. Signed-off-by: Bruce Richardson --- NOTE: this patch is not suitable for backporting, but a new patch for this issue can be done for older releases if the other patches on this set are accepted and backported. --- app/test-pmd/cmdline.c | 8 ++++---- app/test-pmd/parameters.c | 12 ++++++------ app/test-pmd/testpmd.c | 24 ++++++++++++------------ app/test-pmd/testpmd.h | 4 ++-- app/test/test_eal_flags.c | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 0a6ed85f33..9ca052a1b9 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -50,7 +50,7 @@ #include #include #include -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_LIBRTE_BOND_PMD #include #include #endif @@ -597,7 +597,7 @@ static void cmd_help_long_parsed(void *parsed_result, " Show the bypass configuration for a bypass enabled NIC" " using the lowest port on the NIC.\n\n" -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_LIBRTE_BOND_PMD "create bonded device (mode) (socket)\n" " Create a new bonded device with specific bonding mode and socket.\n\n" @@ -5732,7 +5732,7 @@ cmdline_parse_inst_t cmd_show_bypass_config = { }, }; -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_LIBRTE_BOND_PMD /* *** SET BONDING MODE *** */ struct cmd_set_bonding_mode_result { cmdline_fixed_string_t set; @@ -19430,7 +19430,7 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_bypass_event, (cmdline_parse_inst_t *)&cmd_set_bypass_timeout, (cmdline_parse_inst_t *)&cmd_show_bypass_config, -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_LIBRTE_BOND_PMD (cmdline_parse_inst_t *) &cmd_set_bonding_mode, (cmdline_parse_inst_t *) &cmd_show_bonding_config, (cmdline_parse_inst_t *) &cmd_set_bonding_primary, diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 7cb0e3d6ec..4f6f6a34f1 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -39,7 +39,7 @@ #include #include #include -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_LIBRTE_BOND_PMD #include #endif #include @@ -128,7 +128,7 @@ usage(char* progname) "the packet will be enqueued into the rx drop-queue. " "If the drop-queue doesn't exist, the packet is dropped. " "By default drop-queue=127.\n"); -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS printf(" --latencystats=N: enable latency and jitter statistcs " "monitoring on forwarding lcore id N.\n"); #endif @@ -610,10 +610,10 @@ launch_args_parse(int argc, char** argv) { "pkt-filter-report-hash", 1, 0, 0 }, { "pkt-filter-size", 1, 0, 0 }, { "pkt-filter-drop-queue", 1, 0, 0 }, -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS { "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 }, @@ -973,7 +973,7 @@ launch_args_parse(int argc, char** argv) "drop queue %d invalid - must" "be >= 0 \n", n); } -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS if (!strcmp(lgopts[opt_idx].name, "latencystats")) { n = atoi(optarg); @@ -986,7 +986,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 7842c3b781..68a6c979b6 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -54,10 +54,10 @@ #endif #include #include -#ifdef RTE_LIBRTE_BITRATE +#ifdef RTE_LIBRTE_BITRATESTATS #include #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS #include #endif @@ -410,7 +410,7 @@ uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF; #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS /* * Set when latency stats is enabled in the commandline @@ -478,7 +478,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; @@ -2063,7 +2063,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; @@ -2078,7 +2078,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(); @@ -2091,7 +2091,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) } } #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS if (latencystats_enabled != 0 && latencystats_lcore_id == rte_lcore_id()) rte_latencystats_update(); @@ -3641,7 +3641,7 @@ signal_handler(int signum) /* uninitialize packet capture framework */ rte_pdump_uninit(); #endif -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS if (latencystats_enabled != 0) rte_latencystats_uninit(); #endif @@ -3706,10 +3706,10 @@ 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 +#ifdef RTE_LIBRTE_LATENCYSTATS latencystats_enabled = 0; #endif @@ -3788,7 +3788,7 @@ main(int argc, char** argv) /* Init metrics library */ rte_metrics_init(rte_socket_id()); -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS if (latencystats_enabled != 0) { int ret = rte_latencystats_init(1, NULL); if (ret) @@ -3800,7 +3800,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 25a12b14f2..54d616ca75 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -402,12 +402,12 @@ extern uint32_t param_total_num_mbufs; extern uint16_t stats_period; -#ifdef RTE_LIBRTE_LATENCY_STATS +#ifdef RTE_LIBRTE_LATENCYSTATS 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 diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index b019656b29..867b91bc24 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -344,7 +344,7 @@ test_invalid_b_flag(void) static int test_invalid_vdev_flag(void) { -#ifdef RTE_LIBRTE_PMD_RING +#ifdef RTE_LIBRTE_RING_PMD #ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point, and we also need to * run another primary process here */ @@ -1504,7 +1504,7 @@ test_eal_flags(void) return ret; } -#ifdef RTE_LIBRTE_PMD_RING +#ifdef RTE_LIBRTE_RING_PMD ret = test_invalid_vdev_flag(); if (ret < 0) { printf("Error in test_invalid_vdev_flag()\n");