X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fmulti_process%2Fl2fwd_fork%2Fflib.c;h=52c6152bf97ed2c6671662f33f97e1f3ef96b248;hb=5d6af85ab00c23f41429f335e462482093994b6e;hp=563035ce5eed7807812af7d1076d022446895431;hpb=95e8005a56e8a03ebe6a6f74c752ce39967c3224;p=dpdk.git

diff --git a/examples/multi_process/l2fwd_fork/flib.c b/examples/multi_process/l2fwd_fork/flib.c
index 563035ce5e..52c6152bf9 100644
--- a/examples/multi_process/l2fwd_fork/flib.c
+++ b/examples/multi_process/l2fwd_fork/flib.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 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.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 #include <unistd.h>
 #include <stdio.h>
@@ -54,10 +25,7 @@
 #include <rte_malloc.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
 #include <rte_launch.h>
 #include <rte_atomic.h>
 #include <rte_cycles.h>
@@ -66,12 +34,10 @@
 #include <rte_per_lcore.h>
 #include <rte_branch_prediction.h>
 #include <rte_interrupts.h>
-#include <rte_pci.h>
 #include <rte_random.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
@@ -136,9 +102,9 @@ slave_proc_func(void)
 	exit(cfg->f(cfg->arg));
 }
 
-/** 
+/**
  * function entrance ran in master thread, which will spawn slave process and wait until
- * specific slave exited. 
+ * specific slave exited.
  **/
 static int
 lcore_func(void *arg __attribute__((unused)))
@@ -173,14 +139,14 @@ lcore_func(void *arg __attribute__((unused)))
 	}
 }
 
-static int 
+static int
 lcore_id_init(void)
 {
 	int i;
 	/* Setup lcore ID allocation map */
 	lcore_cfg = rte_zmalloc("LCORE_ID_MAP",
 						sizeof(uint16_t) * RTE_MAX_LCORE,
-						CACHE_LINE_SIZE);
+						RTE_CACHE_LINE_SIZE);
 
 	if(lcore_cfg == NULL)
 		rte_panic("Failed to malloc\n");
@@ -199,9 +165,9 @@ flib_assign_lcore_id(void)
 	int ret;
 
 	/**
-	 * thread assigned a lcore id previously, or a  slave thread. But still have 
+	 * thread assigned a lcore id previously, or a  slave thread. But still have
 	 * a bug here: If the core mask includes core 0, and that core call this
-	 * function, it still can get a new lcore id. 
+	 * function, it still can get a new lcore id.
 	 **/
 	if (rte_lcore_id() != 0)
 		return -1;
@@ -228,7 +194,7 @@ void
 flib_free_lcore_id(unsigned lcore_id)
 {
 	/* id is not valid or belongs to pinned core id */
-	if (lcore_id >= RTE_MAX_LCORE || lcore_id == 0 || 
+	if (lcore_id >= RTE_MAX_LCORE || lcore_id == 0 ||
 		rte_lcore_is_enabled(lcore_id))
 		return;
 
@@ -236,7 +202,7 @@ flib_free_lcore_id(unsigned lcore_id)
 }
 
 int
-flib_register_slave_exit_notify(unsigned slave_id, 
+flib_register_slave_exit_notify(unsigned slave_id,
 	slave_exit_notify *cb)
 {
 	if (cb == NULL)
@@ -250,7 +216,7 @@ flib_register_slave_exit_notify(unsigned slave_id,
 	return 0;
 }
 
-enum slave_stat 
+enum slave_stat
 flib_query_slave_status(unsigned slave_id)
 {
 	if (!rte_lcore_is_enabled(slave_id))
@@ -295,12 +261,12 @@ flib_mp_remote_launch(lcore_function_t *f, void *arg,
 	return rte_eal_mp_remote_launch(lcore_func, NULL, call_master);
 }
 
-int 
+int
 flib_init(void)
 {
 	if ((core_cfg = rte_zmalloc("core_cfg",
 		sizeof(struct lcore_stat) * RTE_MAX_LCORE,
-		CACHE_LINE_SIZE)) == NULL ) {
+		RTE_CACHE_LINE_SIZE)) == NULL ) {
 		printf("rte_zmalloc failed\n");
 		return -1;
 	}