From patchwork Tue Oct 15 13:35:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61267 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 BB55F1EBE0; Tue, 15 Oct 2019 15:35:30 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id C1A061E8CE for ; Tue, 15 Oct 2019 15:35:26 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 06:35:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,300,1566889200"; d="scan'208";a="195280689" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 06:35:25 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: jerinjacobk@gmail.com, bluca@debian.org, Bruce Richardson Date: Tue, 15 Oct 2019 14:35:07 +0100 Message-Id: <20191015133513.11376-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191015133513.11376-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191015133513.11376-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/7] 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 a046b74ad..e40ab68da 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', 'exception_path', 'fips_validation', 'flow_classify', From patchwork Tue Oct 15 13:35:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61268 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 38DC91EBF2; Tue, 15 Oct 2019 15:35:34 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id C59001EBDB for ; Tue, 15 Oct 2019 15:35:27 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 06:35:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,300,1566889200"; d="scan'208";a="195280693" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 06:35:26 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: jerinjacobk@gmail.com, bluca@debian.org, Bruce Richardson Date: Tue, 15 Oct 2019 14:35:08 +0100 Message-Id: <20191015133513.11376-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191015133513.11376-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191015133513.11376-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/7] 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 Tue Oct 15 13:35:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61269 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 8A6541EBFD; Tue, 15 Oct 2019 15:35:37 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id DA0BA1EBDB for ; Tue, 15 Oct 2019 15:35:28 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 06:35:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,300,1566889200"; d="scan'208";a="195280698" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 06:35:27 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: jerinjacobk@gmail.com, bluca@debian.org, Bruce Richardson Date: Tue, 15 Oct 2019 14:35:09 +0100 Message-Id: <20191015133513.11376-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191015133513.11376-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191015133513.11376-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 3/7] 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 specifies 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 122c63244..ad540fd84 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 Tue Oct 15 13:35:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61270 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 0BB491EC0E; Tue, 15 Oct 2019 15:35:41 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 3BD241EBDC for ; Tue, 15 Oct 2019 15:35:30 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 06:35:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,300,1566889200"; d="scan'208";a="195280703" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 06:35:28 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: jerinjacobk@gmail.com, bluca@debian.org, Bruce Richardson Date: Tue, 15 Oct 2019 14:35:10 +0100 Message-Id: <20191015133513.11376-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191015133513.11376-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191015133513.11376-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 4/7] 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 | 27 +++++++++++++++++++ examples/performance-thread/meson.build | 10 ------- 3 files changed, 29 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 e40ab68da..889bb6b2c 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -31,7 +31,8 @@ all_examples = [ 'multi_process/simple_mp', 'multi_process/symmetric_mp', 'netmap_compat', 'ntb', 'packet_ordering', - 'performance-thread', 'ptpclient', + 'performance-thread/l3fwd-thread', + 'ptpclient', 'qos_meter', 'qos_sched', 'quota_watermark', '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..185fa59a4 --- /dev/null +++ b/examples/performance-thread/l3fwd-thread/meson.build @@ -0,0 +1,27 @@ +# 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'] + +# get the performance thread (pt) architecture subdir +if dpdk_conf.has('RTE_ARCH_ARM64') + pt_arch_dir = '../common/arch/arm64' +else + pt_arch_dir = '../common/arch/x86' +endif +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', + pt_arch_dir + '/ctx.c') + +includes += include_directories('../common', pt_arch_dir) 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 Tue Oct 15 13:35:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61271 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 7528C1EC25; Tue, 15 Oct 2019 15:35:43 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 646F11EBE9 for ; Tue, 15 Oct 2019 15:35:31 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 06:35:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,300,1566889200"; d="scan'208";a="195280707" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 06:35:30 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: jerinjacobk@gmail.com, bluca@debian.org, Bruce Richardson Date: Tue, 15 Oct 2019 14:35:11 +0100 Message-Id: <20191015133513.11376-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191015133513.11376-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191015133513.11376-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 5/7] 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 | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 examples/performance-thread/pthread_shim/meson.build diff --git a/examples/meson.build b/examples/meson.build index 889bb6b2c..8ef81446f 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -32,6 +32,7 @@ all_examples = [ 'multi_process/symmetric_mp', 'netmap_compat', 'ntb', 'packet_ordering', 'performance-thread/l3fwd-thread', + 'performance-thread/pthread_shim', 'ptpclient', 'qos_meter', 'qos_sched', 'quota_watermark', '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..393fbd122 --- /dev/null +++ b/examples/performance-thread/pthread_shim/meson.build @@ -0,0 +1,28 @@ +# 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'] + +# get the performance thread (pt) architecture subdir +if dpdk_conf.has('RTE_ARCH_ARM64') + pt_arch_dir = '../common/arch/arm64' +else + pt_arch_dir = '../common/arch/x86' +endif +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', + pt_arch_dir + '/ctx.c') + +includes += include_directories('../common', pt_arch_dir) From patchwork Tue Oct 15 13:35:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61272 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 A8DB91EC31; Tue, 15 Oct 2019 15:35:45 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 9286B1EBDE for ; Tue, 15 Oct 2019 15:35:32 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 06:35:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,300,1566889200"; d="scan'208";a="195280712" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 06:35:31 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: jerinjacobk@gmail.com, bluca@debian.org, Bruce Richardson Date: Tue, 15 Oct 2019 14:35:12 +0100 Message-Id: <20191015133513.11376-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191015133513.11376-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191015133513.11376-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 6/7] 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 8ef81446f..6f5f00ec7 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -36,7 +36,8 @@ all_examples = [ 'ptpclient', 'qos_meter', 'qos_sched', 'quota_watermark', '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 Tue Oct 15 13:35:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 61273 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 5F6531EC3E; Tue, 15 Oct 2019 15:35:47 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id CE7D71EBDE for ; Tue, 15 Oct 2019 15:35:33 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 06:35:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,300,1566889200"; d="scan'208";a="195280715" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga007.fm.intel.com with ESMTP; 15 Oct 2019 06:35:32 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: jerinjacobk@gmail.com, bluca@debian.org, Bruce Richardson Date: Tue, 15 Oct 2019 14:35:13 +0100 Message-Id: <20191015133513.11376-8-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191015133513.11376-1-bruce.richardson@intel.com> References: <20191014113448.7442-1-bruce.richardson@intel.com> <20191015133513.11376-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 7/7] 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 6f5f00ec7..8a15dafcf 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -37,6 +37,7 @@ all_examples = [ 'qos_meter', 'qos_sched', 'quota_watermark', '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')