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/ring: fix device pointer on allocation
[dpdk.git]
/
lib
/
librte_distributor
/
rte_distributor.c
diff --git
a/lib/librte_distributor/rte_distributor.c
b/lib/librte_distributor/rte_distributor.c
index
a4c8ff6
..
1c047f0
100644
(file)
--- a/
lib/librte_distributor/rte_distributor.c
+++ b/
lib/librte_distributor/rte_distributor.c
@@
-8,7
+8,6
@@
#include <rte_mbuf.h>
#include <rte_memory.h>
#include <rte_cycles.h>
#include <rte_mbuf.h>
#include <rte_memory.h>
#include <rte_cycles.h>
-#include <rte_function_versioning.h>
#include <rte_memzone.h>
#include <rte_errno.h>
#include <rte_string_fns.h>
#include <rte_memzone.h>
#include <rte_errno.h>
#include <rte_string_fns.h>
@@
-17,7
+16,7
@@
#include <rte_tailq.h>
#include "rte_distributor.h"
#include <rte_tailq.h>
#include "rte_distributor.h"
-#include "rte_distributor_
v20
.h"
+#include "rte_distributor_
single
.h"
#include "distributor_private.h"
TAILQ_HEAD(rte_dist_burst_list, rte_distributor);
#include "distributor_private.h"
TAILQ_HEAD(rte_dist_burst_list, rte_distributor);
@@
-42,7
+41,7
@@
rte_distributor_request_pkt(struct rte_distributor *d,
volatile int64_t *retptr64;
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
volatile int64_t *retptr64;
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
- rte_distributor_request_pkt_
v20(d->d_v20
,
+ rte_distributor_request_pkt_
single(d->d_single
,
worker_id, oldpkt[0]);
return;
}
worker_id, oldpkt[0]);
return;
}
@@
-93,7
+92,8
@@
rte_distributor_poll_pkt(struct rte_distributor *d,
unsigned int i;
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
unsigned int i;
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
- pkts[0] = rte_distributor_poll_pkt_v20(d->d_v20, worker_id);
+ pkts[0] = rte_distributor_poll_pkt_single(d->d_single,
+ worker_id);
return (pkts[0]) ? 1 : 0;
}
return (pkts[0]) ? 1 : 0;
}
@@
-133,7
+133,7
@@
rte_distributor_get_pkt(struct rte_distributor *d,
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
if (return_count <= 1) {
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
if (return_count <= 1) {
- pkts[0] = rte_distributor_get_pkt_
v20(d->d_v20
,
+ pkts[0] = rte_distributor_get_pkt_
single(d->d_single
,
worker_id, oldpkt[0]);
return (pkts[0]) ? 1 : 0;
} else
worker_id, oldpkt[0]);
return (pkts[0]) ? 1 : 0;
} else
@@
-163,7
+163,7
@@
rte_distributor_return_pkt(struct rte_distributor *d,
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
if (num == 1)
if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {
if (num == 1)
- return rte_distributor_return_pkt_
v20(d->d_v20
,
+ return rte_distributor_return_pkt_
single(d->d_single
,
worker_id, oldpkt[0]);
else
return -EINVAL;
worker_id, oldpkt[0]);
else
return -EINVAL;
@@
-354,7
+354,8
@@
rte_distributor_process(struct rte_distributor *d,
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
- return rte_distributor_process_v20(d->d_v20, mbufs, num_mbufs);
+ return rte_distributor_process_single(d->d_single,
+ mbufs, num_mbufs);
}
if (unlikely(num_mbufs == 0)) {
}
if (unlikely(num_mbufs == 0)) {
@@
-494,7
+495,7
@@
rte_distributor_returned_pkts(struct rte_distributor *d,
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
- return rte_distributor_returned_pkts_
v20(d->d_v20
,
+ return rte_distributor_returned_pkts_
single(d->d_single
,
mbufs, max_mbufs);
}
mbufs, max_mbufs);
}
@@
-537,7
+538,7
@@
rte_distributor_flush(struct rte_distributor *d)
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
- return rte_distributor_flush_
v20(d->d_v20
);
+ return rte_distributor_flush_
single(d->d_single
);
}
flushed = total_outstanding(d);
}
flushed = total_outstanding(d);
@@
-568,7
+569,7
@@
rte_distributor_clear_returns(struct rte_distributor *d)
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
if (d->alg_type == RTE_DIST_ALG_SINGLE) {
/* Call the old API */
- rte_distributor_clear_returns_
v20(d->d_v20
);
+ rte_distributor_clear_returns_
single(d->d_single
);
return;
}
return;
}
@@
-610,9
+611,9
@@
rte_distributor_create(const char *name,
rte_errno = ENOMEM;
return NULL;
}
rte_errno = ENOMEM;
return NULL;
}
- d->d_
v20 = rte_distributor_create_v20
(name,
+ d->d_
single = rte_distributor_create_single
(name,
socket_id, num_workers);
socket_id, num_workers);
- if (d->d_
v20
== NULL) {
+ if (d->d_
single
== NULL) {
free(d);
/* rte_errno will have been set */
return NULL;
free(d);
/* rte_errno will have been set */
return NULL;