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/mlx5: fix meter flow direction check
[dpdk.git]
/
examples
/
l2fwd
/
main.c
diff --git
a/examples/l2fwd/main.c
b/examples/l2fwd/main.c
index
7d1b08a
..
b775670
100644
(file)
--- a/
examples/l2fwd/main.c
+++ b/
examples/l2fwd/main.c
@@
-9,7
+9,6
@@
#include <inttypes.h>
#include <sys/types.h>
#include <sys/queue.h>
#include <inttypes.h>
#include <sys/types.h>
#include <sys/queue.h>
-#include <netinet/in.h>
#include <setjmp.h>
#include <stdarg.h>
#include <ctype.h>
#include <setjmp.h>
#include <stdarg.h>
#include <ctype.h>
@@
-260,8
+259,8
@@
l2fwd_main_loop(void)
/* if timer has reached its timeout */
if (unlikely(timer_tsc >= timer_period)) {
/* if timer has reached its timeout */
if (unlikely(timer_tsc >= timer_period)) {
- /* do this only on ma
ster
core */
- if (lcore_id == rte_get_ma
ster
_lcore()) {
+ /* do this only on ma
in
core */
+ if (lcore_id == rte_get_ma
in
_lcore()) {
print_stats();
/* reset the timer */
timer_tsc = 0;
print_stats();
/* reset the timer */
timer_tsc = 0;
@@
-307,7
+306,7
@@
l2fwd_usage(const char *prgname)
" -p PORTMASK: hexadecimal bitmask of ports to configure\n"
" -q NQ: number of queue (=ports) per lcore (default is 1)\n"
" -T PERIOD: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default, 86400 maximum)\n"
" -p PORTMASK: hexadecimal bitmask of ports to configure\n"
" -q NQ: number of queue (=ports) per lcore (default is 1)\n"
" -T PERIOD: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default, 86400 maximum)\n"
- " --
[no-]mac-updating: Enable or d
isable MAC addresses updating (enabled by default)\n"
+ " --
no-mac-updating: D
isable MAC addresses updating (enabled by default)\n"
" When enabled:\n"
" - The source MAC address is replaced by the TX port MAC address\n"
" - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n"
" When enabled:\n"
" - The source MAC address is replaced by the TX port MAC address\n"
" - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n"
@@
-425,7
+424,6
@@
static const char short_options[] =
"T:" /* timer period */
;
"T:" /* timer period */
;
-#define CMD_LINE_OPT_MAC_UPDATING "mac-updating"
#define CMD_LINE_OPT_NO_MAC_UPDATING "no-mac-updating"
#define CMD_LINE_OPT_PORTMAP_CONFIG "portmap"
#define CMD_LINE_OPT_NO_MAC_UPDATING "no-mac-updating"
#define CMD_LINE_OPT_PORTMAP_CONFIG "portmap"
@@
-434,13
+432,13
@@
enum {
/* first long only option value must be >= 256, so that we won't
* conflict with short options */
/* first long only option value must be >= 256, so that we won't
* conflict with short options */
- CMD_LINE_OPT_
MIN
_NUM = 256,
+ CMD_LINE_OPT_
NO_MAC_UPDATING
_NUM = 256,
CMD_LINE_OPT_PORTMAP_NUM,
};
static const struct option lgopts[] = {
CMD_LINE_OPT_PORTMAP_NUM,
};
static const struct option lgopts[] = {
- { CMD_LINE_OPT_
MAC_UPDATING, no_argument, &mac_updating, 1}
,
-
{ CMD_LINE_OPT_NO_MAC_UPDATING, no_argument, &mac_updating, 0
},
+ { CMD_LINE_OPT_
NO_MAC_UPDATING, no_argument, 0
,
+
CMD_LINE_OPT_NO_MAC_UPDATING_NUM
},
{ CMD_LINE_OPT_PORTMAP_CONFIG, 1, 0, CMD_LINE_OPT_PORTMAP_NUM},
{NULL, 0, 0, 0}
};
{ CMD_LINE_OPT_PORTMAP_CONFIG, 1, 0, CMD_LINE_OPT_PORTMAP_NUM},
{NULL, 0, 0, 0}
};
@@
-502,6
+500,10
@@
l2fwd_parse_args(int argc, char **argv)
}
break;
}
break;
+ case CMD_LINE_OPT_NO_MAC_UPDATING_NUM:
+ mac_updating = 0;
+ break;
+
default:
l2fwd_usage(prgname);
return -1;
default:
l2fwd_usage(prgname);
return -1;
@@
-884,8
+886,8
@@
main(int argc, char **argv)
ret = 0;
/* launch per-lcore init on every lcore */
ret = 0;
/* launch per-lcore init on every lcore */
- rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MA
STER
);
- RTE_LCORE_FOREACH_
SLAVE
(lcore_id) {
+ rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MA
IN
);
+ RTE_LCORE_FOREACH_
WORKER
(lcore_id) {
if (rte_eal_wait_lcore(lcore_id) < 0) {
ret = -1;
break;
if (rte_eal_wait_lcore(lcore_id) < 0) {
ret = -1;
break;
@@
-903,6
+905,9
@@
main(int argc, char **argv)
rte_eth_dev_close(portid);
printf(" Done\n");
}
rte_eth_dev_close(portid);
printf(" Done\n");
}
+
+ /* clean up the EAL */
+ rte_eal_cleanup();
printf("Bye...\n");
return ret;
printf("Bye...\n");
return ret;