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
doc: cleanup UIO hard requirement
[dpdk.git]
/
lib
/
librte_port
/
rte_port_ring.c
diff --git
a/lib/librte_port/rte_port_ring.c
b/lib/librte_port/rte_port_ring.c
index
85fad44
..
a4e709c
100644
(file)
--- a/
lib/librte_port/rte_port_ring.c
+++ b/
lib/librte_port/rte_port_ring.c
@@
-67,7
+67,7
@@
rte_port_ring_reader_create_internal(void *params, int socket_id,
uint32_t is_multi)
{
struct rte_port_ring_reader_params *conf =
uint32_t is_multi)
{
struct rte_port_ring_reader_params *conf =
-
(struct rte_port_ring_reader_params *)
params;
+ params;
struct rte_port_ring_reader *port;
/* Check input parameters */
struct rte_port_ring_reader *port;
/* Check input parameters */
@@
-108,7
+108,7
@@
rte_port_ring_multi_reader_create(void *params, int socket_id)
static int
rte_port_ring_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
{
static int
rte_port_ring_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
{
- struct rte_port_ring_reader *p =
(struct rte_port_ring_reader *)
port;
+ struct rte_port_ring_reader *p = port;
uint32_t nb_rx;
nb_rx = rte_ring_sc_dequeue_burst(p->ring, (void **) pkts,
uint32_t nb_rx;
nb_rx = rte_ring_sc_dequeue_burst(p->ring, (void **) pkts,
@@
-122,7
+122,7
@@
static int
rte_port_ring_multi_reader_rx(void *port, struct rte_mbuf **pkts,
uint32_t n_pkts)
{
rte_port_ring_multi_reader_rx(void *port, struct rte_mbuf **pkts,
uint32_t n_pkts)
{
- struct rte_port_ring_reader *p =
(struct rte_port_ring_reader *)
port;
+ struct rte_port_ring_reader *p = port;
uint32_t nb_rx;
nb_rx = rte_ring_mc_dequeue_burst(p->ring, (void **) pkts,
uint32_t nb_rx;
nb_rx = rte_ring_mc_dequeue_burst(p->ring, (void **) pkts,
@@
-150,7
+150,7
@@
rte_port_ring_reader_stats_read(void *port,
struct rte_port_in_stats *stats, int clear)
{
struct rte_port_ring_reader *p =
struct rte_port_in_stats *stats, int clear)
{
struct rte_port_ring_reader *p =
-
(struct rte_port_ring_reader *)
port;
+ port;
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
@@
-194,7
+194,7
@@
rte_port_ring_writer_create_internal(void *params, int socket_id,
uint32_t is_multi)
{
struct rte_port_ring_writer_params *conf =
uint32_t is_multi)
{
struct rte_port_ring_writer_params *conf =
-
(struct rte_port_ring_writer_params *)
params;
+ params;
struct rte_port_ring_writer *port;
/* Check input parameters */
struct rte_port_ring_writer *port;
/* Check input parameters */
@@
-270,7
+270,7
@@
send_burst_mp(struct rte_port_ring_writer *p)
static int
rte_port_ring_writer_tx(void *port, struct rte_mbuf *pkt)
{
static int
rte_port_ring_writer_tx(void *port, struct rte_mbuf *pkt)
{
- struct rte_port_ring_writer *p =
(struct rte_port_ring_writer *)
port;
+ struct rte_port_ring_writer *p = port;
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_STATS_PKTS_IN_ADD(p, 1);
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_STATS_PKTS_IN_ADD(p, 1);
@@
-283,7
+283,7
@@
rte_port_ring_writer_tx(void *port, struct rte_mbuf *pkt)
static int
rte_port_ring_multi_writer_tx(void *port, struct rte_mbuf *pkt)
{
static int
rte_port_ring_multi_writer_tx(void *port, struct rte_mbuf *pkt)
{
- struct rte_port_ring_writer *p =
(struct rte_port_ring_writer *)
port;
+ struct rte_port_ring_writer *p = port;
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_STATS_PKTS_IN_ADD(p, 1);
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_STATS_PKTS_IN_ADD(p, 1);
@@
-293,14
+293,14
@@
rte_port_ring_multi_writer_tx(void *port, struct rte_mbuf *pkt)
return 0;
}
return 0;
}
-static
inline int __attribute__((always_inline))
+static
__rte_always_inline int
rte_port_ring_writer_tx_bulk_internal(void *port,
struct rte_mbuf **pkts,
uint64_t pkts_mask,
uint32_t is_multi)
{
struct rte_port_ring_writer *p =
rte_port_ring_writer_tx_bulk_internal(void *port,
struct rte_mbuf **pkts,
uint64_t pkts_mask,
uint32_t is_multi)
{
struct rte_port_ring_writer *p =
-
(struct rte_port_ring_writer *)
port;
+ port;
uint64_t bsz_mask = p->bsz_mask;
uint32_t tx_buf_count = p->tx_buf_count;
uint64_t bsz_mask = p->bsz_mask;
uint32_t tx_buf_count = p->tx_buf_count;
@@
-374,7
+374,7
@@
rte_port_ring_multi_writer_tx_bulk(void *port,
static int
rte_port_ring_writer_flush(void *port)
{
static int
rte_port_ring_writer_flush(void *port)
{
- struct rte_port_ring_writer *p =
(struct rte_port_ring_writer *)
port;
+ struct rte_port_ring_writer *p = port;
if (p->tx_buf_count > 0)
send_burst(p);
if (p->tx_buf_count > 0)
send_burst(p);
@@
-385,7
+385,7
@@
rte_port_ring_writer_flush(void *port)
static int
rte_port_ring_multi_writer_flush(void *port)
{
static int
rte_port_ring_multi_writer_flush(void *port)
{
- struct rte_port_ring_writer *p =
(struct rte_port_ring_writer *)
port;
+ struct rte_port_ring_writer *p = port;
if (p->tx_buf_count > 0)
send_burst_mp(p);
if (p->tx_buf_count > 0)
send_burst_mp(p);
@@
-396,7
+396,7
@@
rte_port_ring_multi_writer_flush(void *port)
static int
rte_port_ring_writer_free(void *port)
{
static int
rte_port_ring_writer_free(void *port)
{
- struct rte_port_ring_writer *p =
(struct rte_port_ring_writer *)
port;
+ struct rte_port_ring_writer *p = port;
if (port == NULL) {
RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
if (port == NULL) {
RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
@@
-418,7
+418,7
@@
rte_port_ring_writer_stats_read(void *port,
struct rte_port_out_stats *stats, int clear)
{
struct rte_port_ring_writer *p =
struct rte_port_out_stats *stats, int clear)
{
struct rte_port_ring_writer *p =
-
(struct rte_port_ring_writer *)
port;
+ port;
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
@@
-463,7
+463,7
@@
rte_port_ring_writer_nodrop_create_internal(void *params, int socket_id,
uint32_t is_multi)
{
struct rte_port_ring_writer_nodrop_params *conf =
uint32_t is_multi)
{
struct rte_port_ring_writer_nodrop_params *conf =
-
(struct rte_port_ring_writer_nodrop_params *)
params;
+ params;
struct rte_port_ring_writer_nodrop *port;
/* Check input parameters */
struct rte_port_ring_writer_nodrop *port;
/* Check input parameters */
@@
-585,7
+585,7
@@
static int
rte_port_ring_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
{
struct rte_port_ring_writer_nodrop *p =
rte_port_ring_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
{
struct rte_port_ring_writer_nodrop *p =
-
(struct rte_port_ring_writer_nodrop *)
port;
+ port;
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
@@
-599,7
+599,7
@@
static int
rte_port_ring_multi_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
{
struct rte_port_ring_writer_nodrop *p =
rte_port_ring_multi_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
{
struct rte_port_ring_writer_nodrop *p =
-
(struct rte_port_ring_writer_nodrop *)
port;
+ port;
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
p->tx_buf[p->tx_buf_count++] = pkt;
RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
@@
-609,14
+609,14
@@
rte_port_ring_multi_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
return 0;
}
return 0;
}
-static
inline int __attribute__((always_inline))
+static
__rte_always_inline int
rte_port_ring_writer_nodrop_tx_bulk_internal(void *port,
struct rte_mbuf **pkts,
uint64_t pkts_mask,
uint32_t is_multi)
{
struct rte_port_ring_writer_nodrop *p =
rte_port_ring_writer_nodrop_tx_bulk_internal(void *port,
struct rte_mbuf **pkts,
uint64_t pkts_mask,
uint32_t is_multi)
{
struct rte_port_ring_writer_nodrop *p =
-
(struct rte_port_ring_writer_nodrop *)
port;
+ port;
uint64_t bsz_mask = p->bsz_mask;
uint32_t tx_buf_count = p->tx_buf_count;
uint64_t bsz_mask = p->bsz_mask;
uint32_t tx_buf_count = p->tx_buf_count;
@@
-705,7
+705,7
@@
static int
rte_port_ring_writer_nodrop_flush(void *port)
{
struct rte_port_ring_writer_nodrop *p =
rte_port_ring_writer_nodrop_flush(void *port)
{
struct rte_port_ring_writer_nodrop *p =
-
(struct rte_port_ring_writer_nodrop *)
port;
+ port;
if (p->tx_buf_count > 0)
send_burst_nodrop(p);
if (p->tx_buf_count > 0)
send_burst_nodrop(p);
@@
-717,7
+717,7
@@
static int
rte_port_ring_multi_writer_nodrop_flush(void *port)
{
struct rte_port_ring_writer_nodrop *p =
rte_port_ring_multi_writer_nodrop_flush(void *port)
{
struct rte_port_ring_writer_nodrop *p =
-
(struct rte_port_ring_writer_nodrop *)
port;
+ port;
if (p->tx_buf_count > 0)
send_burst_mp_nodrop(p);
if (p->tx_buf_count > 0)
send_burst_mp_nodrop(p);
@@
-729,7
+729,7
@@
static int
rte_port_ring_writer_nodrop_free(void *port)
{
struct rte_port_ring_writer_nodrop *p =
rte_port_ring_writer_nodrop_free(void *port)
{
struct rte_port_ring_writer_nodrop *p =
-
(struct rte_port_ring_writer_nodrop *)
port;
+ port;
if (port == NULL) {
RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
if (port == NULL) {
RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
@@
-751,7
+751,7
@@
rte_port_ring_writer_nodrop_stats_read(void *port,
struct rte_port_out_stats *stats, int clear)
{
struct rte_port_ring_writer_nodrop *p =
struct rte_port_out_stats *stats, int clear)
{
struct rte_port_ring_writer_nodrop *p =
-
(struct rte_port_ring_writer_nodrop *)
port;
+ port;
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));