From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 7FCB77E1B for ; Fri, 26 Sep 2014 15:58:12 +0200 (CEST) Received: by mail-wg0-f52.google.com with SMTP id n12so7924169wgh.11 for ; Fri, 26 Sep 2014 07:04:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tFafPixoj9hG4BoFfR0WgUloQHiGxubGboszXtqW+i4=; b=BWHme7GSVcjfn9RvLV74UHIbJp+SPZ6f15A6/BitpRrKxyaWJwhaJKEsEMrABzKBqe vUYY92xzq81YzzavuXOCfGB1qgSGAScz9XQRYjmAEXJsWueQw+tI9ooVCGsk5nBKfDXa AUgBzmRHBAoGYeVFunZ8hLlVozeFKo04Z9uZ+0leKSIFfJ076jG1dhFt+lXSDpRdZp+q TdrjsZ6XXKPilb8rtwCn8yokL89XTsgSxlIKGURSdAG32QGze+bAI/wmELKOLs8a0obR 3QiXkPh2or24v2NRdRmXo0ui/8ELfwNuvgQ+T0h1s2am2sYNqvCcAA7rE4mEZfSO3Xfq gjJw== X-Gm-Message-State: ALoCoQlom2KLGLlHus0yc1reh5I4FWoR9AwtlHk+3xDFtDulMZ8CrTHHn3oKiXR2dnOvRl0azde6 X-Received: by 10.194.143.69 with SMTP id sc5mr23618515wjb.26.1411740274948; Fri, 26 Sep 2014 07:04:34 -0700 (PDT) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id fs13sm1246085wic.19.2014.09.26.07.04.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Sep 2014 07:04:34 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Fri, 26 Sep 2014 16:04:02 +0200 Message-Id: <1411740242-4240-6-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1411740242-4240-1-git-send-email-thomas.monjalon@6wind.com> References: <1411740242-4240-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 5/5] examples: no more bare metal environment X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2014 13:58:14 -0000 From: David Marchand Signed-off-by: David Marchand --- examples/cmdline/main.c | 3 +- examples/cmdline/main.h | 45 --------------------- examples/dpdk_qat/main.c | 3 +- examples/dpdk_qat/main.h | 45 --------------------- examples/helloworld/main.c | 4 +- examples/helloworld/main.h | 45 --------------------- examples/ip_fragmentation/main.c | 4 +- examples/ip_fragmentation/main.h | 46 ---------------------- examples/ip_pipeline/main.c | 2 +- examples/ip_pipeline/main.h | 8 ---- examples/ip_reassembly/main.c | 4 +- examples/ip_reassembly/main.h | 46 ---------------------- examples/ipv4_multicast/main.c | 4 +- examples/ipv4_multicast/main.h | 46 ---------------------- examples/l2fwd/main.c | 4 +- examples/l2fwd/main.h | 45 --------------------- examples/l3fwd-acl/main.c | 4 +- examples/l3fwd-acl/main.h | 45 --------------------- examples/l3fwd-power/main.c | 4 +- examples/l3fwd-power/main.h | 45 --------------------- examples/l3fwd-vf/main.c | 4 +- examples/l3fwd-vf/main.h | 45 --------------------- examples/l3fwd/main.c | 4 +- examples/l3fwd/main.h | 41 ------------------- examples/link_status_interrupt/main.c | 4 +- examples/link_status_interrupt/main.h | 45 --------------------- examples/load_balancer/main.c | 2 +- examples/load_balancer/main.h | 8 ---- .../client_server_mp/mp_server/init.c | 1 - .../client_server_mp/mp_server/main.c | 3 +- .../client_server_mp/mp_server/main.h | 45 --------------------- examples/multi_process/l2fwd_fork/main.c | 3 +- examples/multi_process/l2fwd_fork/main.h | 45 --------------------- examples/qos_meter/main.c | 2 +- examples/qos_meter/main.h | 9 ----- examples/qos_sched/main.c | 2 +- examples/qos_sched/main.h | 7 ---- examples/quota_watermark/qw/main.c | 2 +- examples/quota_watermark/qw/main.h | 9 ----- examples/quota_watermark/qwctl/qwctl.c | 2 +- examples/quota_watermark/qwctl/qwctl.h | 8 ---- examples/timer/main.c | 4 +- examples/timer/main.h | 45 --------------------- examples/vhost/main.c | 6 +-- examples/vhost/main.h | 7 ---- examples/vhost_xen/main.c | 2 +- examples/vhost_xen/main.h | 8 ---- examples/vmdq/main.c | 8 +--- examples/vmdq/main.h | 46 ---------------------- examples/vmdq_dcb/main.c | 8 +--- examples/vmdq_dcb/main.h | 46 ---------------------- 51 files changed, 27 insertions(+), 896 deletions(-) delete mode 100644 examples/cmdline/main.h delete mode 100644 examples/dpdk_qat/main.h delete mode 100644 examples/helloworld/main.h delete mode 100644 examples/ip_fragmentation/main.h delete mode 100644 examples/ip_reassembly/main.h delete mode 100644 examples/ipv4_multicast/main.h delete mode 100644 examples/l2fwd/main.h delete mode 100644 examples/l3fwd-acl/main.h delete mode 100644 examples/l3fwd-power/main.h delete mode 100644 examples/l3fwd-vf/main.h delete mode 100644 examples/l3fwd/main.h delete mode 100644 examples/link_status_interrupt/main.h delete mode 100644 examples/multi_process/client_server_mp/mp_server/main.h delete mode 100644 examples/multi_process/l2fwd_fork/main.h delete mode 100644 examples/timer/main.h delete mode 100644 examples/vmdq/main.h delete mode 100644 examples/vmdq_dcb/main.h diff --git a/examples/cmdline/main.c b/examples/cmdline/main.c index 668f152..f8ee0a5 100644 --- a/examples/cmdline/main.c +++ b/examples/cmdline/main.c @@ -77,9 +77,8 @@ #include #include "commands.h" -#include "main.h" -int MAIN(int argc, char **argv) +int main(int argc, char **argv) { int ret; struct cmdline *cl; diff --git a/examples/cmdline/main.h b/examples/cmdline/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/cmdline/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c index c130ea3..d487650 100644 --- a/examples/dpdk_qat/main.c +++ b/examples/dpdk_qat/main.c @@ -69,7 +69,6 @@ #include #include -#include "main.h" #include "crypto.h" #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) @@ -672,7 +671,7 @@ init_mem(void) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_conf *qconf; struct rte_eth_link link; diff --git a/examples/dpdk_qat/main.h b/examples/dpdk_qat/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/dpdk_qat/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/helloworld/main.c b/examples/helloworld/main.c index 0c0f833..a4bbd11 100644 --- a/examples/helloworld/main.c +++ b/examples/helloworld/main.c @@ -46,8 +46,6 @@ #include #include -#include "main.h" - static int lcore_hello(__attribute__((unused)) void *arg) { @@ -58,7 +56,7 @@ lcore_hello(__attribute__((unused)) void *arg) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { int ret; unsigned lcore_id; diff --git a/examples/helloworld/main.h b/examples/helloworld/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/helloworld/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index 75028ac..46cc664 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -75,8 +75,6 @@ #include -#include "main.h" - #define RTE_LOGTYPE_IP_FRAG RTE_LOGTYPE_USER1 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) @@ -848,7 +846,7 @@ init_mem(void) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_queue_conf *qconf; struct rx_queue *rxq; diff --git a/examples/ip_fragmentation/main.h b/examples/ip_fragmentation/main.h deleted file mode 100644 index f8c8415..0000000 --- a/examples/ip_fragmentation/main.h +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/ip_pipeline/main.c b/examples/ip_pipeline/main.c index e19412f..2c53877 100644 --- a/examples/ip_pipeline/main.c +++ b/examples/ip_pipeline/main.c @@ -76,7 +76,7 @@ #include "main.h" int -MAIN(int argc, char **argv) +main(int argc, char **argv) { int ret; diff --git a/examples/ip_pipeline/main.h b/examples/ip_pipeline/main.h index 4bce203..6085aaa 100644 --- a/examples/ip_pipeline/main.h +++ b/examples/ip_pipeline/main.h @@ -295,12 +295,4 @@ struct app_msg_resp { #define APP_FLUSH 0xFF -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - #endif /* _MAIN_H_ */ diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 9ba3f0a..32f7d98 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -79,8 +79,6 @@ #include -#include "main.h" - #define MAX_PKT_BURST 32 @@ -1055,7 +1053,7 @@ signal_handler(int signum) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_queue_conf *qconf; struct rx_queue *rxq; diff --git a/examples/ip_reassembly/main.h b/examples/ip_reassembly/main.h deleted file mode 100644 index f8c8415..0000000 --- a/examples/ip_reassembly/main.h +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index 5c2ab86..21ff7c6 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -71,8 +71,6 @@ #include #include -#include "main.h" - #define RTE_LOGTYPE_IPv4_MULTICAST RTE_LOGTYPE_USER1 #define MAX_PORTS 16 @@ -710,7 +708,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_queue_conf *qconf; int ret; diff --git a/examples/ipv4_multicast/main.h b/examples/ipv4_multicast/main.h deleted file mode 100644 index f8c8415..0000000 --- a/examples/ipv4_multicast/main.h +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index e16c914..c58ce3e 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -70,8 +70,6 @@ #include #include -#include "main.h" - #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) @@ -581,7 +579,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_queue_conf *qconf; struct rte_eth_dev_info dev_info; diff --git a/examples/l2fwd/main.h b/examples/l2fwd/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/l2fwd/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index 4dd6b34..7be2d50 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -73,8 +73,6 @@ #include #include -#include "main.h" - #define DO_RFC_1812_CHECKS #define RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1 @@ -1966,7 +1964,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_conf *qconf; int ret; diff --git a/examples/l3fwd-acl/main.h b/examples/l3fwd-acl/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/l3fwd-acl/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 3bf63ff..a498a46 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -76,8 +76,6 @@ #include #include -#include "main.h" - #define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1 #define MAX_PKT_BURST 32 @@ -1510,7 +1508,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_conf *qconf; int ret; diff --git a/examples/l3fwd-power/main.h b/examples/l3fwd-power/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/l3fwd-power/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c index f567aa8..497fea8 100644 --- a/examples/l3fwd-vf/main.c +++ b/examples/l3fwd-vf/main.c @@ -73,8 +73,6 @@ #include #include -#include "main.h" - #define APP_LOOKUP_EXACT_MATCH 0 #define APP_LOOKUP_LPM 1 #define DO_RFC_1812_CHECKS @@ -976,7 +974,7 @@ init_mem(unsigned nb_mbuf) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_conf *qconf; int ret; diff --git a/examples/l3fwd-vf/main.h b/examples/l3fwd-vf/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/l3fwd-vf/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 01220e3..a643d2f 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -73,8 +73,6 @@ #include #include -#include "main.h" - #define APP_LOOKUP_EXACT_MATCH 0 #define APP_LOOKUP_LPM 1 #define DO_RFC_1812_CHECKS @@ -2445,7 +2443,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_conf *qconf; int ret; diff --git a/examples/l3fwd/main.h b/examples/l3fwd/main.h deleted file mode 100644 index eb13b29..0000000 --- a/examples/l3fwd/main.h +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#define MAIN main - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c index b8b7571..e8e677f 100644 --- a/examples/link_status_interrupt/main.c +++ b/examples/link_status_interrupt/main.c @@ -71,8 +71,6 @@ #include #include -#include "main.h" - #define RTE_LOGTYPE_LSI RTE_LOGTYPE_USER1 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM) @@ -630,7 +628,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_queue_conf *qconf; struct rte_eth_dev_info dev_info; diff --git a/examples/link_status_interrupt/main.h b/examples/link_status_interrupt/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/link_status_interrupt/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/load_balancer/main.c b/examples/load_balancer/main.c index 47b0ba7..d0e2c05 100644 --- a/examples/load_balancer/main.c +++ b/examples/load_balancer/main.c @@ -75,7 +75,7 @@ #include "main.h" int -MAIN(int argc, char **argv) +main(int argc, char **argv) { uint32_t lcore; int ret; diff --git a/examples/load_balancer/main.h b/examples/load_balancer/main.h index 82cdf95..d9f878b 100644 --- a/examples/load_balancer/main.h +++ b/examples/load_balancer/main.h @@ -368,12 +368,4 @@ uint32_t app_get_lcores_io_rx(void); uint32_t app_get_lcores_worker(void); void app_print_params(void); -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - #endif /* _MAIN_H_ */ diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c index 30518c0..fdcc3c6 100644 --- a/examples/multi_process/client_server_mp/mp_server/init.c +++ b/examples/multi_process/client_server_mp/mp_server/init.c @@ -68,7 +68,6 @@ #include "common.h" #include "args.h" #include "init.h" -#include "main.h" #define MBUFS_PER_CLIENT 1536 #define MBUFS_PER_PORT 1536 diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c index b3887b1..01ccd37 100644 --- a/examples/multi_process/client_server_mp/mp_server/main.c +++ b/examples/multi_process/client_server_mp/mp_server/main.c @@ -72,7 +72,6 @@ #include "common.h" #include "args.h" #include "init.h" -#include "main.h" /* * When doing reads from the NIC or the client queues, @@ -301,7 +300,7 @@ do_packet_forwarding(void) } int -MAIN(int argc, char *argv[]) +main(int argc, char *argv[]) { /* initialise the system */ if (init(argc, argv) < 0 ) diff --git a/examples/multi_process/client_server_mp/mp_server/main.h b/examples/multi_process/client_server_mp/mp_server/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/multi_process/client_server_mp/mp_server/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/multi_process/l2fwd_fork/main.c b/examples/multi_process/l2fwd_fork/main.c index c887b63..de64bc9 100644 --- a/examples/multi_process/l2fwd_fork/main.c +++ b/examples/multi_process/l2fwd_fork/main.c @@ -74,7 +74,6 @@ #include #include -#include "main.h" #include "flib.h" #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1 @@ -999,7 +998,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { struct lcore_queue_conf *qconf; struct rte_eth_dev_info dev_info; diff --git a/examples/multi_process/l2fwd_fork/main.h b/examples/multi_process/l2fwd_fork/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/multi_process/l2fwd_fork/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c index c02ac50..b05b631 100644 --- a/examples/qos_meter/main.c +++ b/examples/qos_meter/main.c @@ -358,7 +358,7 @@ parse_args(int argc, char **argv) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { uint32_t lcore_id; int ret; diff --git a/examples/qos_meter/main.h b/examples/qos_meter/main.h index 7bffce5..530bf69 100644 --- a/examples/qos_meter/main.h +++ b/examples/qos_meter/main.h @@ -48,15 +48,6 @@ enum policer_action policer_table[e_RTE_METER_COLORS][e_RTE_METER_COLORS] = { DROP, DROP, RED} }; -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - - #if APP_MODE == APP_MODE_FWD #define FUNC_METER(a,b,c,d) color, flow_id=flow_id, pkt_len=pkt_len, time=time diff --git a/examples/qos_sched/main.c b/examples/qos_sched/main.c index 19a4f85..ed3cbea 100644 --- a/examples/qos_sched/main.c +++ b/examples/qos_sched/main.c @@ -223,7 +223,7 @@ app_stat(void) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { int ret; diff --git a/examples/qos_sched/main.h b/examples/qos_sched/main.h index f3b3956..971ec27 100644 --- a/examples/qos_sched/main.h +++ b/examples/qos_sched/main.h @@ -40,12 +40,6 @@ extern "C" { #include -#ifdef RTE_EXEC_ENV_BAREMETAL -#error "Baremetal is not supported" -#else -#define MAIN main -#endif - #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1 /* @@ -177,7 +171,6 @@ extern struct ring_thresh tx_thresh; extern struct rte_sched_port_params port_params; -int MAIN(int argc, char **argv); int app_parse_args(int argc, char **argv); int app_init(void); diff --git a/examples/quota_watermark/qw/main.c b/examples/quota_watermark/qw/main.c index c8bd62f..f269546 100644 --- a/examples/quota_watermark/qw/main.c +++ b/examples/quota_watermark/qw/main.c @@ -304,7 +304,7 @@ send_stage(__attribute__((unused)) void *args) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { int ret; unsigned int lcore_id, master_lcore_id, last_lcore_id; diff --git a/examples/quota_watermark/qw/main.h b/examples/quota_watermark/qw/main.h index 3b78324..79d3c26 100644 --- a/examples/quota_watermark/qw/main.h +++ b/examples/quota_watermark/qw/main.h @@ -36,12 +36,6 @@ #include "../include/conf.h" -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - enum ring_state { RING_READY, RING_OVERLOADED, @@ -62,7 +56,4 @@ is_bit_set(int i, unsigned int mask) return ((1 << i) & mask); } - -int MAIN(int argc, char **argv); - #endif /* _MAIN_H_ */ diff --git a/examples/quota_watermark/qwctl/qwctl.c b/examples/quota_watermark/qwctl/qwctl.c index 8bf9e33..eb2f618 100644 --- a/examples/quota_watermark/qwctl/qwctl.c +++ b/examples/quota_watermark/qwctl/qwctl.c @@ -71,7 +71,7 @@ setup_shared_variables(void) low_watermark = (unsigned int *) qw_memzone->addr + sizeof(int); } -int MAIN(int argc, char **argv) +int main(int argc, char **argv) { int ret; struct cmdline *cl; diff --git a/examples/quota_watermark/qwctl/qwctl.h b/examples/quota_watermark/qwctl/qwctl.h index 4209307..8d146e5 100644 --- a/examples/quota_watermark/qwctl/qwctl.h +++ b/examples/quota_watermark/qwctl/qwctl.h @@ -34,15 +34,7 @@ #ifndef _MAIN_H_ #define _MAIN_H_ -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - extern int *quota; extern unsigned int *low_watermark; -int MAIN(int argc, char **argv); - #endif /* _MAIN_H_ */ diff --git a/examples/timer/main.c b/examples/timer/main.c index a5ff015..5a5d33c 100644 --- a/examples/timer/main.c +++ b/examples/timer/main.c @@ -49,8 +49,6 @@ #include #include -#include "main.h" - #define TIMER_RESOLUTION_CYCLES 20000000ULL /* around 10ms at 2 Ghz */ static struct rte_timer timer0; @@ -115,7 +113,7 @@ lcore_mainloop(__attribute__((unused)) void *arg) } int -MAIN(int argc, char **argv) +main(int argc, char **argv) { int ret; uint64_t hz; diff --git a/examples/timer/main.h b/examples/timer/main.h deleted file mode 100644 index f54938b..0000000 --- a/examples/timer/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN(int argc, char **argv); - -#endif /* _MAIN_H_ */ diff --git a/examples/vhost/main.c b/examples/vhost/main.c index c81b8f5..b01df51 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -3528,7 +3528,7 @@ setup_mempool_tbl(int socket, uint32_t index, char *pool_name, * device is also registered here to handle the IOCTLs. */ int -MAIN(int argc, char *argv[]) +main(int argc, char *argv[]) { struct rte_mempool *mbuf_pool = NULL; unsigned lcore_id, core_id = 0; @@ -3694,10 +3694,10 @@ MAIN(int argc, char *argv[]) } LOG_DEBUG(VHOST_CONFIG, - "in MAIN: mbuf count in mempool at initial " + "in main: mbuf count in mempool at initial " "is: %d\n", count_in_mempool); LOG_DEBUG(VHOST_CONFIG, - "in MAIN: mbuf count in ring at initial is :" + "in main: mbuf count in ring at initial is :" " %d\n", rte_ring_count(vpool_array[index].ring)); } diff --git a/examples/vhost/main.h b/examples/vhost/main.h index c15d938..6d75da0 100644 --- a/examples/vhost/main.h +++ b/examples/vhost/main.h @@ -34,12 +34,6 @@ #ifndef _MAIN_H_ #define _MAIN_H_ -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - //#define DEBUG #ifdef DEBUG @@ -82,5 +76,4 @@ struct lcore_info struct lcore_ll_info *lcore_ll; /* Pointer to data core specific lcore_ll_info struct */ }; -int MAIN(int argc, char **argv); #endif /* _MAIN_H_ */ diff --git a/examples/vhost_xen/main.c b/examples/vhost_xen/main.c index 498de06..8d62f8d 100644 --- a/examples/vhost_xen/main.c +++ b/examples/vhost_xen/main.c @@ -1445,7 +1445,7 @@ int init_virtio_net(struct virtio_net_device_ops const * const ops); * device is also registered here to handle the IOCTLs. */ int -MAIN(int argc, char *argv[]) +main(int argc, char *argv[]) { struct rte_mempool *mbuf_pool; unsigned lcore_id, core_id = 0; diff --git a/examples/vhost_xen/main.h b/examples/vhost_xen/main.h index 4010766..481572e 100644 --- a/examples/vhost_xen/main.h +++ b/examples/vhost_xen/main.h @@ -34,12 +34,6 @@ #ifndef _MAIN_H_ #define _MAIN_H_ -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - //#define DEBUG #ifdef DEBUG @@ -80,6 +74,4 @@ struct lcore_info { struct lcore_ll_info *lcore_ll; /* Pointer to data core specific lcore_ll_info struct */ }; - -int MAIN(int argc, char **argv); #endif /* _MAIN_H_ */ diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c index a162d8b..2d93bbf 100644 --- a/examples/vmdq/main.c +++ b/examples/vmdq/main.c @@ -70,8 +70,6 @@ #include #include -#include "main.h" - #define MAX_QUEUES 128 /* * For 10 GbE, 128 queues require roughly @@ -454,7 +452,6 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port) ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->s_addr); } -#ifndef RTE_EXEC_ENV_BAREMETAL /* When we receive a HUP signal, print out our stats */ static void sighup_handler(int signum) @@ -467,7 +464,6 @@ sighup_handler(int signum) } printf("\nFinished handling signal %d\n", signum); } -#endif /* * Main thread that does the work, reading from INPUT_PORT @@ -573,7 +569,7 @@ static unsigned check_ports_num(unsigned nb_ports) /* Main function, does initialisation and calls the per-lcore functions */ int -MAIN(int argc, char *argv[]) +main(int argc, char *argv[]) { struct rte_mempool *mbuf_pool; unsigned lcore_id, core_id = 0; @@ -581,9 +577,7 @@ MAIN(int argc, char *argv[]) unsigned nb_ports, valid_num_ports; uint8_t portid; -#ifndef RTE_EXEC_ENV_BAREMETAL signal(SIGHUP, sighup_handler); -#endif /* init EAL */ ret = rte_eal_init(argc, argv); diff --git a/examples/vmdq/main.h b/examples/vmdq/main.h deleted file mode 100644 index f13c9aa..0000000 --- a/examples/vmdq/main.h +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN( int argc, char *argv[] ); - -#endif /* ifndef _MAIN_H_ */ diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c index 2f708a1..a09a972 100644 --- a/examples/vmdq_dcb/main.c +++ b/examples/vmdq_dcb/main.c @@ -70,8 +70,6 @@ #include #include -#include "main.h" - /* basic constants used in application */ #define NUM_QUEUES 128 @@ -341,7 +339,6 @@ vmdq_parse_args(int argc, char **argv) } -#ifndef RTE_EXEC_ENV_BAREMETAL /* When we receive a HUP signal, print out our stats */ static void sighup_handler(int signum) @@ -354,7 +351,6 @@ sighup_handler(int signum) } printf("\nFinished handling signal %d\n", signum); } -#endif /* * Main thread that does the work, reading from INPUT_PORT @@ -429,7 +425,7 @@ static unsigned check_ports_num(unsigned nb_ports) /* Main function, does initialisation and calls the per-lcore functions */ int -MAIN(int argc, char *argv[]) +main(int argc, char *argv[]) { unsigned cores; struct rte_mempool *mbuf_pool; @@ -439,9 +435,7 @@ MAIN(int argc, char *argv[]) unsigned nb_ports, valid_num_ports; uint8_t portid; -#ifndef RTE_EXEC_ENV_BAREMETAL signal(SIGHUP, sighup_handler); -#endif /* init EAL */ ret = rte_eal_init(argc, argv); diff --git a/examples/vmdq_dcb/main.h b/examples/vmdq_dcb/main.h deleted file mode 100644 index f13c9aa..0000000 --- a/examples/vmdq_dcb/main.h +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - - -#ifdef RTE_EXEC_ENV_BAREMETAL -#define MAIN _main -#else -#define MAIN main -#endif - -int MAIN( int argc, char *argv[] ); - -#endif /* ifndef _MAIN_H_ */ -- 2.0.4