From patchwork Mon Oct 14 11:34:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61098 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A0DB21C1ED; Mon, 14 Oct 2019 13:35:06 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 068501C1E9 for ; Mon, 14 Oct 2019 13:35:00 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:34:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974134" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:34:58 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:41 +0100 Message-Id: <20191014113448.7442-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/8] examples/bpf: remove from list of examples to build 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" The examples/bpf directory does not contain an example app, but rather example code for use with testpmd's BPF support. Therefore, we should not attempt to build it when the user requests "examples=all". This also synchronises the meson behaviour with make which similarly doesn't compile up the code. Signed-off-by: Bruce Richardson --- examples/bpf/meson.build | 6 ------ examples/meson.build | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 examples/bpf/meson.build diff --git a/examples/bpf/meson.build b/examples/bpf/meson.build deleted file mode 100644 index 0a817aaea..000000000 --- a/examples/bpf/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -# This contains BPF example code for use in testing BPF with testpmd, -# therefore it should not be built as part of a meson build. -build=false diff --git a/examples/meson.build b/examples/meson.build index e4580f74a..9de6618ef 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -11,7 +11,7 @@ execinfo = cc.find_library('execinfo', required: false) # list of all example apps. Keep 1-3 per line, in alphabetical order. all_examples = [ 'bbdev_app', 'bond', - 'bpf', 'cmdline', + 'cmdline', 'distributor', 'ethtool', 'eventdev_pipeline', 'fips_validation', 'flow_classify', From patchwork Mon Oct 14 11:34:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61099 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 948991C1F5; Mon, 14 Oct 2019 13:35:11 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id A52571C1C4 for ; Mon, 14 Oct 2019 13:35:01 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:35:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974139" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:34:59 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:42 +0100 Message-Id: <20191014113448.7442-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/8] examples/ethtool: allow building as part of meson build 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" Since the code for the ethtool example was contained in subdirectories the compilation of this example is different from most of the other apps, and it had not been abled when the user requests a build with "-Dexamples=all". To simplify the build with meson, the separate ethtool library is not build separately, rather the app is built as a single entity. Signed-off-by: Bruce Richardson --- examples/ethtool/meson.build | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build index c370d7476..603396bae 100644 --- a/examples/ethtool/meson.build +++ b/examples/ethtool/meson.build @@ -6,5 +6,14 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -# Example app currently unsupported by meson build -build = false +sources = files('lib/rte_ethtool.c', + 'ethtool-app/ethapp.c', + 'ethtool-app/main.c') +includes = include_directories('lib', 'ethtool-app') + +deps += 'bus_pci' +if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') + deps += 'pmd_ixgbe' +endif + +allow_experimental_apis = true From patchwork Mon Oct 14 11:34:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61100 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 84E641C200; Mon, 14 Oct 2019 13:35:17 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 50ED01C1E3 for ; Mon, 14 Oct 2019 13:35:02 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:35:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974144" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:35:00 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:43 +0100 Message-Id: <20191014113448.7442-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/8] examples/performance-thread: remove warning disabling 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" The warnings about functions not returning values can be removed from the code by just adding an attribute to the function to specify it doesn't return. The GCC bug referenced in the makefile which prevents this from working has been fixed for >10 years according to bugzilla. Signed-off-by: Bruce Richardson --- examples/performance-thread/l3fwd-thread/Makefile | 6 ------ examples/performance-thread/l3fwd-thread/main.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile index 1a1c95829..b14b21e30 100644 --- a/examples/performance-thread/l3fwd-thread/Makefile +++ b/examples/performance-thread/l3fwd-thread/Makefile @@ -20,10 +20,4 @@ include $(RTE_SDK)/examples/performance-thread/common/common.mk CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS) -# workaround for a gcc bug with noreturn attribute -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603 -#ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) -CFLAGS_main.o += -Wno-return-type -#endif - include $(RTE_SDK)/mk/rte.extapp.mk diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 00f535053..d9af5c78d 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -1877,7 +1877,7 @@ process_burst(struct rte_mbuf *pkts_burst[MAX_PKT_BURST], int nb_rx, /* * CPU-load stats collector */ -static int +static int __attribute__((noreturn)) cpu_load_collector(__rte_unused void *arg) { unsigned i, j, k; uint64_t hits; @@ -2299,7 +2299,7 @@ sched_spawner(__rte_unused void *arg) { } /* main processing loop */ -static int +static int __attribute__((noreturn)) pthread_tx(void *dummy) { struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; From patchwork Mon Oct 14 11:34:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61101 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C2F481C209; Mon, 14 Oct 2019 13:35:19 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id EC3A71C1C4 for ; Mon, 14 Oct 2019 13:35:02 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:35:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974151" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:35:01 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:44 +0100 Message-Id: <20191014113448.7442-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 4/8] examples/performance-thread: rename directory to standard 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" In other places in DPDK, e.g. EAL, the architecture-specific files for arm are just stored in a folder called "arm". Rename the "arm64" folder for performance thread example to align to this naming. Signed-off-by: Bruce Richardson --- examples/performance-thread/common/arch/{arm64 => arm}/ctx.c | 0 examples/performance-thread/common/arch/{arm64 => arm}/ctx.h | 0 examples/performance-thread/common/arch/{arm64 => arm}/stack.h | 0 examples/performance-thread/common/common.mk | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename examples/performance-thread/common/arch/{arm64 => arm}/ctx.c (100%) rename examples/performance-thread/common/arch/{arm64 => arm}/ctx.h (100%) rename examples/performance-thread/common/arch/{arm64 => arm}/stack.h (100%) diff --git a/examples/performance-thread/common/arch/arm64/ctx.c b/examples/performance-thread/common/arch/arm/ctx.c similarity index 100% rename from examples/performance-thread/common/arch/arm64/ctx.c rename to examples/performance-thread/common/arch/arm/ctx.c diff --git a/examples/performance-thread/common/arch/arm64/ctx.h b/examples/performance-thread/common/arch/arm/ctx.h similarity index 100% rename from examples/performance-thread/common/arch/arm64/ctx.h rename to examples/performance-thread/common/arch/arm/ctx.h diff --git a/examples/performance-thread/common/arch/arm64/stack.h b/examples/performance-thread/common/arch/arm/stack.h similarity index 100% rename from examples/performance-thread/common/arch/arm64/stack.h rename to examples/performance-thread/common/arch/arm/stack.h diff --git a/examples/performance-thread/common/common.mk b/examples/performance-thread/common/common.mk index 5e2b18a9f..021e61aea 100644 --- a/examples/performance-thread/common/common.mk +++ b/examples/performance-thread/common/common.mk @@ -11,7 +11,7 @@ MKFILE_PATH=$(abspath $(dir $(lastword $(MAKEFILE_LIST)))) ifeq ($(CONFIG_RTE_ARCH_X86_64),y) ARCH_PATH += $(MKFILE_PATH)/arch/x86 else ifeq ($(CONFIG_RTE_ARCH_ARM64),y) -ARCH_PATH += $(MKFILE_PATH)/arch/arm64 +ARCH_PATH += $(MKFILE_PATH)/arch/arm endif VPATH := $(MKFILE_PATH) $(ARCH_PATH) From patchwork Mon Oct 14 11:34:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61102 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B7EAC1C212; Mon, 14 Oct 2019 13:35:21 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 482C21C1E9 for ; Mon, 14 Oct 2019 13:35:03 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:35:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974158" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:35:02 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:45 +0100 Message-Id: <20191014113448.7442-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 5/8] examples/performance-thread: add l3fwd-thread to meson 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" Limited to x86_64 systems, as it fails to compile on any others and is disabled in the examples makefile for non-x86_64 systems. Signed-off-by: Bruce Richardson --- examples/meson.build | 3 ++- .../l3fwd-thread/meson.build | 22 +++++++++++++++++++ examples/performance-thread/meson.build | 10 --------- 3 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 examples/performance-thread/l3fwd-thread/meson.build delete mode 100644 examples/performance-thread/meson.build diff --git a/examples/meson.build b/examples/meson.build index 9de6618ef..7dedc787d 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -30,7 +30,8 @@ all_examples = [ 'multi_process/simple_mp', 'multi_process/symmetric_mp', 'ntb', 'packet_ordering', - 'performance-thread', 'ptpclient', + 'performance-thread/l3fwd-thread', + 'ptpclient', 'qos_meter', 'qos_sched', 'rxtx_callbacks', 'server_node_efd', 'service_cores', diff --git a/examples/performance-thread/l3fwd-thread/meson.build b/examples/performance-thread/l3fwd-thread/meson.build new file mode 100644 index 000000000..f25f201ce --- /dev/null +++ b/examples/performance-thread/l3fwd-thread/meson.build @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# meson file, for building this example as part of a main DPDK build. +# +# To build this example as a standalone application with an already-installed +# DPDK instance, use 'make' + +build = dpdk_conf.has('RTE_ARCH_X86_64') +deps += ['timer', 'lpm'] + +sources += files('main.c', + '../common/lthread.c', + '../common/lthread_cond.c', + '../common/lthread_diag.c', + '../common/lthread_mutex.c', + '../common/lthread_sched.c', + '../common/lthread_tls.c', + '../common/arch/@0@/ctx.c'.format(arch_subdir)) + +includes += include_directories('../common', + '../common/arch/@0@'.format(arch_subdir)) diff --git a/examples/performance-thread/meson.build b/examples/performance-thread/meson.build deleted file mode 100644 index c370d7476..000000000 --- a/examples/performance-thread/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -# meson file, for building this example as part of a main DPDK build. -# -# To build this example as a standalone application with an already-installed -# DPDK instance, use 'make' - -# Example app currently unsupported by meson build -build = false From patchwork Mon Oct 14 11:34:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61103 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D80661C232; Mon, 14 Oct 2019 13:35:23 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id E89311C1DA for ; Mon, 14 Oct 2019 13:35:04 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:35:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974163" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:35:03 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:46 +0100 Message-Id: <20191014113448.7442-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 6/8] examples/performance-thread: add pthread shim to meson 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" Signed-off-by: Bruce Richardson --- examples/meson.build | 1 + .../pthread_shim/meson.build | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 examples/performance-thread/pthread_shim/meson.build diff --git a/examples/meson.build b/examples/meson.build index 7dedc787d..ff4e8608c 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -31,6 +31,7 @@ all_examples = [ 'multi_process/symmetric_mp', 'ntb', 'packet_ordering', 'performance-thread/l3fwd-thread', + 'performance-thread/pthread_shim', 'ptpclient', 'qos_meter', 'qos_sched', 'rxtx_callbacks', diff --git a/examples/performance-thread/pthread_shim/meson.build b/examples/performance-thread/pthread_shim/meson.build new file mode 100644 index 000000000..4feec05a7 --- /dev/null +++ b/examples/performance-thread/pthread_shim/meson.build @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# meson file, for building this example as part of a main DPDK build. +# +# To build this example as a standalone application with an already-installed +# DPDK instance, use 'make' + +build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64') +deps += ['timer'] + +sources += files('main.c', + 'pthread_shim.c', + '../common/lthread.c', + '../common/lthread_cond.c', + '../common/lthread_diag.c', + '../common/lthread_mutex.c', + '../common/lthread_sched.c', + '../common/lthread_tls.c', + '../common/arch/@0@/ctx.c'.format(arch_subdir)) + +includes += include_directories('../common', + '../common/arch/@0@'.format(arch_subdir)) From patchwork Mon Oct 14 11:34:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61104 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 82C301C23C; Mon, 14 Oct 2019 13:35:25 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 988251C1E3 for ; Mon, 14 Oct 2019 13:35:05 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:35:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974168" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:35:04 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:47 +0100 Message-Id: <20191014113448.7442-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 7/8] examples/server_node_efd: add node binary to meson build 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" Signed-off-by: Bruce Richardson --- examples/meson.build | 3 ++- examples/server_node_efd/{ => node}/meson.build | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename examples/server_node_efd/{ => node}/meson.build (60%) diff --git a/examples/meson.build b/examples/meson.build index ff4e8608c..352921ea8 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -35,7 +35,8 @@ all_examples = [ 'ptpclient', 'qos_meter', 'qos_sched', 'rxtx_callbacks', - 'server_node_efd', 'service_cores', + 'server_node_efd/node', + 'service_cores', 'skeleton', 'tep_termination', 'timer', 'vdpa', 'vhost', 'vhost_crypto', diff --git a/examples/server_node_efd/meson.build b/examples/server_node_efd/node/meson.build similarity index 60% rename from examples/server_node_efd/meson.build rename to examples/server_node_efd/node/meson.build index c370d7476..30f28761f 100644 --- a/examples/server_node_efd/meson.build +++ b/examples/server_node_efd/node/meson.build @@ -1,10 +1,13 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation +# Copyright(c) 2019 Intel Corporation # meson file, for building this example as part of a main DPDK build. # # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -# Example app currently unsupported by meson build -build = false +name = 'efd_node' + +deps += ['hash'] +sources += files('node.c') +includes += include_directories('../shared') From patchwork Mon Oct 14 11:34:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61105 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 709E81C29C; Mon, 14 Oct 2019 13:35:27 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 485411C1E9 for ; Mon, 14 Oct 2019 13:35:06 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 04:35:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,295,1566889200"; d="scan'208";a="194974172" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 14 Oct 2019 04:35:04 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Mon, 14 Oct 2019 12:34:48 +0100 Message-Id: <20191014113448.7442-9-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191014113448.7442-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 8/8] examples/server_node_efd: add server binary to meson build 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" Signed-off-by: Bruce Richardson --- examples/meson.build | 1 + examples/server_node_efd/server/meson.build | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 examples/server_node_efd/server/meson.build diff --git a/examples/meson.build b/examples/meson.build index 352921ea8..4bc1e17af 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -36,6 +36,7 @@ all_examples = [ 'qos_meter', 'qos_sched', 'rxtx_callbacks', 'server_node_efd/node', + 'server_node_efd/server', 'service_cores', 'skeleton', 'tep_termination', 'timer', 'vdpa', diff --git a/examples/server_node_efd/server/meson.build b/examples/server_node_efd/server/meson.build new file mode 100644 index 000000000..23e08d1ae --- /dev/null +++ b/examples/server_node_efd/server/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# meson file, for building this example as part of a main DPDK build. +# +# To build this example as a standalone application with an already-installed +# DPDK instance, use 'make' + +name = 'efd_server' + +deps += 'efd' +sources += files('args.c', 'init.c', 'main.c') +includes += include_directories('../shared')