git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: fix Rx queue startup state
[dpdk.git]
/
examples
/
bond
/
main.c
diff --git
a/examples/bond/main.c
b/examples/bond/main.c
index
ee8fa2d
..
a63ca70
100644
(file)
--- a/
examples/bond/main.c
+++ b/
examples/bond/main.c
@@
-41,6
+41,10
@@
#include <rte_tcp.h>
#include <rte_arp.h>
#include <rte_spinlock.h>
#include <rte_tcp.h>
#include <rte_arp.h>
#include <rte_spinlock.h>
+#include <rte_devargs.h>
+#include <rte_byteorder.h>
+#include <rte_cpuflags.h>
+#include <rte_eth_bond.h>
#include <cmdline_rdline.h>
#include <cmdline_parse.h>
#include <cmdline_rdline.h>
#include <cmdline_parse.h>
@@
-53,13
+57,6
@@
#include "main.h"
#include "main.h"
-#include <rte_devargs.h>
-
-
-#include "rte_byteorder.h"
-#include "rte_cpuflags.h"
-#include "rte_eth_bond.h"
-
#define RTE_LOGTYPE_DCB RTE_LOGTYPE_USER1
#define NB_MBUF (1024*8)
#define RTE_LOGTYPE_DCB RTE_LOGTYPE_USER1
#define NB_MBUF (1024*8)
@@
-107,8
+104,7
@@
#define MAX_PORTS 4
#define PRINT_MAC(addr) printf("%02"PRIx8":%02"PRIx8":%02"PRIx8 \
":%02"PRIx8":%02"PRIx8":%02"PRIx8, \
#define MAX_PORTS 4
#define PRINT_MAC(addr) printf("%02"PRIx8":%02"PRIx8":%02"PRIx8 \
":%02"PRIx8":%02"PRIx8":%02"PRIx8, \
- addr.addr_bytes[0], addr.addr_bytes[1], addr.addr_bytes[2], \
- addr.addr_bytes[3], addr.addr_bytes[4], addr.addr_bytes[5])
+ RTE_ETHER_ADDR_BYTES(&addr))
uint16_t slaves[RTE_MAX_ETHPORTS];
uint16_t slaves_count;
uint16_t slaves[RTE_MAX_ETHPORTS];
uint16_t slaves_count;
@@
-359,7
+355,7
@@
struct global_flag_stru_t *global_flag_stru_p = &global_flag_stru;
* Main thread that does the work, reading from INPUT_PORT
* and writing to OUTPUT_PORT
*/
* Main thread that does the work, reading from INPUT_PORT
* and writing to OUTPUT_PORT
*/
-static int lcore_main(__
attribute__((unused))
void *arg1)
+static int lcore_main(__
rte_unused
void *arg1)
{
struct rte_mbuf *pkts[MAX_PKT_BURST] __rte_cache_aligned;
struct rte_ether_addr d_addr;
{
struct rte_mbuf *pkts[MAX_PKT_BURST] __rte_cache_aligned;
struct rte_ether_addr d_addr;
@@
-481,8
+477,8
@@
static inline void get_string(struct cmd_obj_send_result *res, char *buf, uint8_
);
}
static void cmd_obj_send_parsed(void *parsed_result,
);
}
static void cmd_obj_send_parsed(void *parsed_result,
- __
attribute__((unused))
struct cmdline *cl,
- __
attribute__((unused))
void *data)
+ __
rte_unused
struct cmdline *cl,
+ __
rte_unused
void *data)
{
struct cmd_obj_send_result *res = parsed_result;
{
struct cmd_obj_send_result *res = parsed_result;
@@
-569,11
+565,11
@@
struct cmd_start_result {
cmdline_fixed_string_t start;
};
cmdline_fixed_string_t start;
};
-static void cmd_start_parsed(__
attribute__((unused))
void *parsed_result,
+static void cmd_start_parsed(__
rte_unused
void *parsed_result,
struct cmdline *cl,
struct cmdline *cl,
- __
attribute__((unused))
void *data)
+ __
rte_unused
void *data)
{
{
- int
slave
_core_id = rte_lcore_id();
+ int
worker
_core_id = rte_lcore_id();
rte_spinlock_trylock(&global_flag_stru_p->lock);
if (global_flag_stru_p->LcoreMainIsRunning == 0) {
rte_spinlock_trylock(&global_flag_stru_p->lock);
if (global_flag_stru_p->LcoreMainIsRunning == 0) {
@@
-590,9
+586,9
@@
static void cmd_start_parsed(__attribute__((unused)) void *parsed_result,
return;
}
return;
}
- /* start lcore main on core != ma
ster
_core - ARP response thread */
-
slave
_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);
- if ((
slave_core_id >= RTE_MAX_LCORE) || (slave
_core_id == 0))
+ /* start lcore main on core != ma
in
_core - ARP response thread */
+
worker
_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);
+ if ((
worker_core_id >= RTE_MAX_LCORE) || (worker
_core_id == 0))
return;
rte_spinlock_trylock(&global_flag_stru_p->lock);
return;
rte_spinlock_trylock(&global_flag_stru_p->lock);
@@
-601,8
+597,8
@@
static void cmd_start_parsed(__attribute__((unused)) void *parsed_result,
cmdline_printf(cl,
"Starting lcore_main on core %d:%d "
"Our IP:%d.%d.%d.%d\n",
cmdline_printf(cl,
"Starting lcore_main on core %d:%d "
"Our IP:%d.%d.%d.%d\n",
-
slave
_core_id,
- rte_eal_remote_launch(lcore_main, NULL,
slave
_core_id),
+
worker
_core_id,
+ rte_eal_remote_launch(lcore_main, NULL,
worker
_core_id),
BOND_IP_1,
BOND_IP_2,
BOND_IP_3,
BOND_IP_1,
BOND_IP_2,
BOND_IP_3,
@@
-627,9
+623,9
@@
struct cmd_help_result {
cmdline_fixed_string_t help;
};
cmdline_fixed_string_t help;
};
-static void cmd_help_parsed(__
attribute__((unused))
void *parsed_result,
+static void cmd_help_parsed(__
rte_unused
void *parsed_result,
struct cmdline *cl,
struct cmdline *cl,
- __
attribute__((unused))
void *data)
+ __
rte_unused
void *data)
{
cmdline_printf(cl,
"ALB - link bonding mode 6 example\n"
{
cmdline_printf(cl,
"ALB - link bonding mode 6 example\n"
@@
-659,9
+655,9
@@
struct cmd_stop_result {
cmdline_fixed_string_t stop;
};
cmdline_fixed_string_t stop;
};
-static void cmd_stop_parsed(__
attribute__((unused))
void *parsed_result,
+static void cmd_stop_parsed(__
rte_unused
void *parsed_result,
struct cmdline *cl,
struct cmdline *cl,
- __
attribute__((unused))
void *data)
+ __
rte_unused
void *data)
{
rte_spinlock_trylock(&global_flag_stru_p->lock);
if (global_flag_stru_p->LcoreMainIsRunning == 0) {
{
rte_spinlock_trylock(&global_flag_stru_p->lock);
if (global_flag_stru_p->LcoreMainIsRunning == 0) {
@@
-700,9
+696,9
@@
struct cmd_quit_result {
cmdline_fixed_string_t quit;
};
cmdline_fixed_string_t quit;
};
-static void cmd_quit_parsed(__
attribute__((unused))
void *parsed_result,
+static void cmd_quit_parsed(__
rte_unused
void *parsed_result,
struct cmdline *cl,
struct cmdline *cl,
- __
attribute__((unused))
void *data)
+ __
rte_unused
void *data)
{
rte_spinlock_trylock(&global_flag_stru_p->lock);
if (global_flag_stru_p->LcoreMainIsRunning == 0) {
{
rte_spinlock_trylock(&global_flag_stru_p->lock);
if (global_flag_stru_p->LcoreMainIsRunning == 0) {
@@
-743,9
+739,9
@@
struct cmd_show_result {
cmdline_fixed_string_t show;
};
cmdline_fixed_string_t show;
};
-static void cmd_show_parsed(__
attribute__((unused))
void *parsed_result,
+static void cmd_show_parsed(__
rte_unused
void *parsed_result,
struct cmdline *cl,
struct cmdline *cl,
- __
attribute__((unused))
void *data)
+ __
rte_unused
void *data)
{
uint16_t slaves[16] = {0};
uint8_t len = 16;
{
uint16_t slaves[16] = {0};
uint8_t len = 16;
@@
-802,8
+798,8
@@
cmdline_parse_ctx_t main_ctx[] = {
NULL,
};
NULL,
};
-/* prompt function, called from main on MA
STER
lcore */
-static void prompt(__
attribute__((unused))
void *arg1)
+/* prompt function, called from main on MA
IN
lcore */
+static void prompt(__
rte_unused
void *arg1)
{
struct cmdline *cl;
{
struct cmdline *cl;
@@
-818,7
+814,7
@@
static void prompt(__attribute__((unused)) void *arg1)
int
main(int argc, char *argv[])
{
int
main(int argc, char *argv[])
{
- int ret,
slave
_core_id;
+ int ret,
worker
_core_id;
uint16_t nb_ports, i;
/* init EAL */
uint16_t nb_ports, i;
/* init EAL */
@@
-852,23
+848,23
@@
main(int argc, char *argv[])
rte_spinlock_init(&global_flag_stru_p->lock);
/* check state of lcores */
rte_spinlock_init(&global_flag_stru_p->lock);
/* check state of lcores */
- RTE_LCORE_FOREACH_
SLAVE(slave
_core_id) {
- if (rte_eal_get_lcore_state(
slave
_core_id) != WAIT)
+ RTE_LCORE_FOREACH_
WORKER(worker
_core_id) {
+ if (rte_eal_get_lcore_state(
worker
_core_id) != WAIT)
return -EBUSY;
}
return -EBUSY;
}
- /* start lcore main on core != ma
ster
_core - ARP response thread */
-
slave
_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);
- if ((
slave_core_id >= RTE_MAX_LCORE) || (slave
_core_id == 0))
+ /* start lcore main on core != ma
in
_core - ARP response thread */
+
worker
_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);
+ if ((
worker_core_id >= RTE_MAX_LCORE) || (worker
_core_id == 0))
return -EPERM;
global_flag_stru_p->LcoreMainIsRunning = 1;
return -EPERM;
global_flag_stru_p->LcoreMainIsRunning = 1;
- global_flag_stru_p->LcoreMainCore =
slave
_core_id;
+ global_flag_stru_p->LcoreMainCore =
worker
_core_id;
printf("Starting lcore_main on core %d:%d Our IP:%d.%d.%d.%d\n",
printf("Starting lcore_main on core %d:%d Our IP:%d.%d.%d.%d\n",
-
slave
_core_id,
+
worker
_core_id,
rte_eal_remote_launch((lcore_function_t *)lcore_main,
NULL,
rte_eal_remote_launch((lcore_function_t *)lcore_main,
NULL,
-
slave
_core_id),
+
worker
_core_id),
BOND_IP_1,
BOND_IP_2,
BOND_IP_3,
BOND_IP_1,
BOND_IP_2,
BOND_IP_3,
@@
-879,5
+875,9
@@
main(int argc, char *argv[])
prompt(NULL);
rte_delay_ms(100);
prompt(NULL);
rte_delay_ms(100);
+
+ /* clean up the EAL */
+ rte_eal_cleanup();
+
return 0;
}
return 0;
}