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
test: fix global variable multiple definitions
[dpdk.git]
/
app
/
test-eventdev
/
evt_options.c
diff --git
a/app/test-eventdev/evt_options.c
b/app/test-eventdev/evt_options.c
index
5f311a5
..
c60b61a
100644
(file)
--- a/
app/test-eventdev/evt_options.c
+++ b/
app/test-eventdev/evt_options.c
@@
-7,6
+7,7
@@
#include <inttypes.h>
#include <getopt.h>
#include <inttypes.h>
#include <getopt.h>
+#include <rte_string_fns.h>
#include <rte_common.h>
#include <rte_eventdev.h>
#include <rte_lcore.h>
#include <rte_common.h>
#include <rte_eventdev.h>
#include <rte_lcore.h>
@@
-84,6
+85,16
@@
evt_parse_queue_priority(struct evt_options *opt, const char *arg __rte_unused)
return 0;
}
return 0;
}
+static int
+evt_parse_deq_tmo_nsec(struct evt_options *opt, const char *arg)
+{
+ int ret;
+
+ ret = parser_read_uint32(&(opt->deq_tmo_nsec), arg);
+
+ return ret;
+}
+
static int
evt_parse_eth_prod_type(struct evt_options *opt, const char *arg __rte_unused)
{
static int
evt_parse_eth_prod_type(struct evt_options *opt, const char *arg __rte_unused)
{
@@
-110,7
+121,7
@@
evt_parse_timer_prod_type_burst(struct evt_options *opt,
static int
evt_parse_test_name(struct evt_options *opt, const char *arg)
{
static int
evt_parse_test_name(struct evt_options *opt, const char *arg)
{
- s
nprintf(opt->test_name, EVT_TEST_NAME_MAX_LEN, "%s", arg
);
+ s
trlcpy(opt->test_name, arg, EVT_TEST_NAME_MAX_LEN
);
return 0;
}
return 0;
}
@@
-222,6
+233,26
@@
evt_parse_work_lcores(struct evt_options *opt, const char *corelist)
return ret;
}
return ret;
}
+static int
+evt_parse_mbuf_sz(struct evt_options *opt, const char *arg)
+{
+ int ret;
+
+ ret = parser_read_uint16(&(opt->mbuf_sz), arg);
+
+ return ret;
+}
+
+static int
+evt_parse_max_pkt_sz(struct evt_options *opt, const char *arg)
+{
+ int ret;
+
+ ret = parser_read_uint32(&(opt->max_pkt_sz), arg);
+
+ return ret;
+}
+
static void
usage(char *program)
{
static void
usage(char *program)
{
@@
-240,6
+271,7
@@
usage(char *program)
"\t--worker_deq_depth : dequeue depth of the worker\n"
"\t--fwd_latency : perform fwd_latency measurement\n"
"\t--queue_priority : enable queue priority\n"
"\t--worker_deq_depth : dequeue depth of the worker\n"
"\t--fwd_latency : perform fwd_latency measurement\n"
"\t--queue_priority : enable queue priority\n"
+ "\t--deq_tmo_nsec : global dequeue timeout\n"
"\t--prod_type_ethdev : use ethernet device as producer.\n"
"\t--prod_type_timerdev : use event timer device as producer.\n"
"\t expity_nsec would be the timeout\n"
"\t--prod_type_ethdev : use ethernet device as producer.\n"
"\t--prod_type_timerdev : use event timer device as producer.\n"
"\t expity_nsec would be the timeout\n"
@@
-250,7
+282,9
@@
usage(char *program)
"\t--nb_timer_adptrs : number of timer adapters to use.\n"
"\t--timer_tick_nsec : timer tick interval in ns.\n"
"\t--max_tmo_nsec : max timeout interval in ns.\n"
"\t--nb_timer_adptrs : number of timer adapters to use.\n"
"\t--timer_tick_nsec : timer tick interval in ns.\n"
"\t--max_tmo_nsec : max timeout interval in ns.\n"
- "\t--expiry_ns : event timer expiry ns.\n"
+ "\t--expiry_nsec : event timer expiry ns.\n"
+ "\t--mbuf_sz : packet mbuf size.\n"
+ "\t--max_pkt_sz : max packet size.\n"
);
printf("available tests:\n");
evt_test_dump_names();
);
printf("available tests:\n");
evt_test_dump_names();
@@
-311,6
+345,7
@@
static struct option lgopts[] = {
{ EVT_SCHED_TYPE_LIST, 1, 0, 0 },
{ EVT_FWD_LATENCY, 0, 0, 0 },
{ EVT_QUEUE_PRIORITY, 0, 0, 0 },
{ EVT_SCHED_TYPE_LIST, 1, 0, 0 },
{ EVT_FWD_LATENCY, 0, 0, 0 },
{ EVT_QUEUE_PRIORITY, 0, 0, 0 },
+ { EVT_DEQ_TMO_NSEC, 1, 0, 0 },
{ EVT_PROD_ETHDEV, 0, 0, 0 },
{ EVT_PROD_TIMERDEV, 0, 0, 0 },
{ EVT_PROD_TIMERDEV_BURST, 0, 0, 0 },
{ EVT_PROD_ETHDEV, 0, 0, 0 },
{ EVT_PROD_TIMERDEV, 0, 0, 0 },
{ EVT_PROD_TIMERDEV_BURST, 0, 0, 0 },
@@
-319,6
+354,8
@@
static struct option lgopts[] = {
{ EVT_TIMER_TICK_NSEC, 1, 0, 0 },
{ EVT_MAX_TMO_NSEC, 1, 0, 0 },
{ EVT_EXPIRY_NSEC, 1, 0, 0 },
{ EVT_TIMER_TICK_NSEC, 1, 0, 0 },
{ EVT_MAX_TMO_NSEC, 1, 0, 0 },
{ EVT_EXPIRY_NSEC, 1, 0, 0 },
+ { EVT_MBUF_SZ, 1, 0, 0 },
+ { EVT_MAX_PKT_SZ, 1, 0, 0 },
{ EVT_HELP, 0, 0, 0 },
{ NULL, 0, 0, 0 }
};
{ EVT_HELP, 0, 0, 0 },
{ NULL, 0, 0, 0 }
};
@@
-342,6
+379,7
@@
evt_opts_parse_long(int opt_idx, struct evt_options *opt)
{ EVT_SCHED_TYPE_LIST, evt_parse_sched_type_list},
{ EVT_FWD_LATENCY, evt_parse_fwd_latency},
{ EVT_QUEUE_PRIORITY, evt_parse_queue_priority},
{ EVT_SCHED_TYPE_LIST, evt_parse_sched_type_list},
{ EVT_FWD_LATENCY, evt_parse_fwd_latency},
{ EVT_QUEUE_PRIORITY, evt_parse_queue_priority},
+ { EVT_DEQ_TMO_NSEC, evt_parse_deq_tmo_nsec},
{ EVT_PROD_ETHDEV, evt_parse_eth_prod_type},
{ EVT_PROD_TIMERDEV, evt_parse_timer_prod_type},
{ EVT_PROD_TIMERDEV_BURST, evt_parse_timer_prod_type_burst},
{ EVT_PROD_ETHDEV, evt_parse_eth_prod_type},
{ EVT_PROD_TIMERDEV, evt_parse_timer_prod_type},
{ EVT_PROD_TIMERDEV_BURST, evt_parse_timer_prod_type_burst},
@@
-350,6
+388,8
@@
evt_opts_parse_long(int opt_idx, struct evt_options *opt)
{ EVT_TIMER_TICK_NSEC, evt_parse_timer_tick_nsec},
{ EVT_MAX_TMO_NSEC, evt_parse_max_tmo_nsec},
{ EVT_EXPIRY_NSEC, evt_parse_expiry_nsec},
{ EVT_TIMER_TICK_NSEC, evt_parse_timer_tick_nsec},
{ EVT_MAX_TMO_NSEC, evt_parse_max_tmo_nsec},
{ EVT_EXPIRY_NSEC, evt_parse_expiry_nsec},
+ { EVT_MBUF_SZ, evt_parse_mbuf_sz},
+ { EVT_MAX_PKT_SZ, evt_parse_max_pkt_sz},
};
for (i = 0; i < RTE_DIM(parsermap); i++) {
};
for (i = 0; i < RTE_DIM(parsermap); i++) {