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
app/crypto-perf: use single mempool
[dpdk.git]
/
examples
/
qos_sched
/
app_thread.c
diff --git
a/examples/qos_sched/app_thread.c
b/examples/qos_sched/app_thread.c
old mode 100755
(executable)
new mode 100644
(file)
index
59c4014
..
15f117f
--- a/
examples/qos_sched/app_thread.c
+++ b/
examples/qos_sched/app_thread.c
@@
-107,7
+107,7
@@
app_rx_thread(struct thread_conf **confs)
}
if (unlikely(rte_ring_sp_enqueue_bulk(conf->rx_ring,
}
if (unlikely(rte_ring_sp_enqueue_bulk(conf->rx_ring,
-
(void **)rx_mbufs, nb_rx) !
= 0)) {
+
(void **)rx_mbufs, nb_rx, NULL) =
= 0)) {
for(i = 0; i < nb_rx; i++) {
rte_pktmbuf_free(rx_mbufs[i]);
for(i = 0; i < nb_rx; i++) {
rte_pktmbuf_free(rx_mbufs[i]);
@@
-179,8
+179,8
@@
app_tx_thread(struct thread_conf **confs)
while ((conf = confs[conf_idx])) {
retval = rte_ring_sc_dequeue_bulk(conf->tx_ring, (void **)mbufs,
while ((conf = confs[conf_idx])) {
retval = rte_ring_sc_dequeue_bulk(conf->tx_ring, (void **)mbufs,
- burst_conf.qos_dequeue);
- if (likely(retval
=
= 0)) {
+ burst_conf.qos_dequeue
, NULL
);
+ if (likely(retval
!
= 0)) {
app_send_packets(conf, mbufs, burst_conf.qos_dequeue);
conf->counter = 0; /* reset empty read loop counter */
app_send_packets(conf, mbufs, burst_conf.qos_dequeue);
conf->counter = 0; /* reset empty read loop counter */
@@
-215,23
+215,24
@@
app_worker_thread(struct thread_conf **confs)
while ((conf = confs[conf_idx])) {
uint32_t nb_pkt;
while ((conf = confs[conf_idx])) {
uint32_t nb_pkt;
- int retval;
/* Read packet from the ring */
/* Read packet from the ring */
-
retval = rte_ring_sc_dequeue_bulk
(conf->rx_ring, (void **)mbufs,
- burst_conf.ring_burst);
- if (likely(
retval == 0
)) {
+
nb_pkt = rte_ring_sc_dequeue_burst
(conf->rx_ring, (void **)mbufs,
+ burst_conf.ring_burst
, NULL
);
+ if (likely(
nb_pkt
)) {
int nb_sent = rte_sched_port_enqueue(conf->sched_port, mbufs,
int nb_sent = rte_sched_port_enqueue(conf->sched_port, mbufs,
-
burst_conf.ring_burs
t);
+
nb_pk
t);
- APP_STATS_ADD(conf->stat.nb_drop,
burst_conf.ring_burs
t - nb_sent);
- APP_STATS_ADD(conf->stat.nb_rx,
burst_conf.ring_burs
t);
+ APP_STATS_ADD(conf->stat.nb_drop,
nb_pk
t - nb_sent);
+ APP_STATS_ADD(conf->stat.nb_rx,
nb_pk
t);
}
nb_pkt = rte_sched_port_dequeue(conf->sched_port, mbufs,
burst_conf.qos_dequeue);
if (likely(nb_pkt > 0))
}
nb_pkt = rte_sched_port_dequeue(conf->sched_port, mbufs,
burst_conf.qos_dequeue);
if (likely(nb_pkt > 0))
- while (rte_ring_sp_enqueue_bulk(conf->tx_ring, (void **)mbufs, nb_pkt) != 0);
+ while (rte_ring_sp_enqueue_bulk(conf->tx_ring,
+ (void **)mbufs, nb_pkt, NULL) == 0)
+ ; /* empty body */
conf_idx++;
if (confs[conf_idx] == NULL)
conf_idx++;
if (confs[conf_idx] == NULL)
@@
-250,17
+251,16
@@
app_mixed_thread(struct thread_conf **confs)
while ((conf = confs[conf_idx])) {
uint32_t nb_pkt;
while ((conf = confs[conf_idx])) {
uint32_t nb_pkt;
- int retval;
/* Read packet from the ring */
/* Read packet from the ring */
-
retval = rte_ring_sc_dequeue_bulk
(conf->rx_ring, (void **)mbufs,
- burst_conf.ring_burst);
- if (likely(
retval == 0
)) {
+
nb_pkt = rte_ring_sc_dequeue_burst
(conf->rx_ring, (void **)mbufs,
+ burst_conf.ring_burst
, NULL
);
+ if (likely(
nb_pkt
)) {
int nb_sent = rte_sched_port_enqueue(conf->sched_port, mbufs,
int nb_sent = rte_sched_port_enqueue(conf->sched_port, mbufs,
-
burst_conf.ring_burs
t);
+
nb_pk
t);
- APP_STATS_ADD(conf->stat.nb_drop,
burst_conf.ring_burs
t - nb_sent);
- APP_STATS_ADD(conf->stat.nb_rx,
burst_conf.ring_burs
t);
+ APP_STATS_ADD(conf->stat.nb_drop,
nb_pk
t - nb_sent);
+ APP_STATS_ADD(conf->stat.nb_rx,
nb_pk
t);
}
}
@@
-291,5
+291,3
@@
app_mixed_thread(struct thread_conf **confs)
conf_idx = 0;
}
}
conf_idx = 0;
}
}
-
-