Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Order pkgconfig includes with arch-specific first
[deb_dpdk.git]
/
lib
/
librte_port
/
rte_port_source_sink.c
diff --git
a/lib/librte_port/rte_port_source_sink.c
b/lib/librte_port/rte_port_source_sink.c
index
056c975
..
a79f2f6
100644
(file)
--- a/
lib/librte_port/rte_port_source_sink.c
+++ b/
lib/librte_port/rte_port_source_sink.c
@@
-38,17
+38,11
@@
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
-#ifdef RTE_NEXT_ABI
-
#ifdef RTE_PORT_PCAP
#include <rte_ether.h>
#include <pcap.h>
#endif
#ifdef RTE_PORT_PCAP
#include <rte_ether.h>
#include <pcap.h>
#endif
-#else
-#undef RTE_PORT_PCAP
-#endif
-
#include "rte_port_source_sink.h"
/*
#include "rte_port_source_sink.h"
/*
@@
-81,8
+75,6
@@
struct rte_port_source {
uint32_t pkt_index;
};
uint32_t pkt_index;
};
-#ifdef RTE_NEXT_ABI
-
#ifdef RTE_PORT_PCAP
static int
#ifdef RTE_PORT_PCAP
static int
@@
-232,13
+224,11
@@
error_exit:
#endif /* RTE_PORT_PCAP */
#endif /* RTE_PORT_PCAP */
-#endif /* RTE_NEXT_ABI */
-
static void *
rte_port_source_create(void *params, int socket_id)
{
struct rte_port_source_params *p =
static void *
rte_port_source_create(void *params, int socket_id)
{
struct rte_port_source_params *p =
-
(struct rte_port_source_params *)
params;
+ params;
struct rte_port_source *port;
/* Check input arguments*/
struct rte_port_source *port;
/* Check input arguments*/
@@
-258,8
+248,6
@@
rte_port_source_create(void *params, int socket_id)
/* Initialization */
port->mempool = (struct rte_mempool *) p->mempool;
/* Initialization */
port->mempool = (struct rte_mempool *) p->mempool;
-#ifdef RTE_NEXT_ABI
-
if (p->file_name) {
int status = PCAP_SOURCE_LOAD(port, p->file_name,
p->n_bytes_per_pkt, socket_id);
if (p->file_name) {
int status = PCAP_SOURCE_LOAD(port, p->file_name,
p->n_bytes_per_pkt, socket_id);
@@
-270,8
+258,6
@@
rte_port_source_create(void *params, int socket_id)
}
}
}
}
-#endif
-
return port;
}
return port;
}
@@
-279,7
+265,7
@@
static int
rte_port_source_free(void *port)
{
struct rte_port_source *p =
rte_port_source_free(void *port)
{
struct rte_port_source *p =
-
(struct rte_port_source *)
port;
+ port;
/* Check input parameters */
if (p == NULL)
/* Check input parameters */
if (p == NULL)
@@
-300,17
+286,12
@@
rte_port_source_free(void *port)
static int
rte_port_source_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
{
static int
rte_port_source_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
{
- struct rte_port_source *p =
(struct rte_port_source *)
port;
+ struct rte_port_source *p = port;
uint32_t i;
uint32_t i;
- if (rte_
mempool_get_bulk(p->mempool, (void **)
pkts, n_pkts) != 0)
+ if (rte_
pktmbuf_alloc_bulk(p->mempool,
pkts, n_pkts) != 0)
return 0;
return 0;
- for (i = 0; i < n_pkts; i++) {
- rte_mbuf_refcnt_set(pkts[i], 1);
- rte_pktmbuf_reset(pkts[i]);
- }
-
if (p->pkt_buff != NULL) {
for (i = 0; i < n_pkts; i++) {
uint8_t *pkt_data = rte_pktmbuf_mtod(pkts[i],
if (p->pkt_buff != NULL) {
for (i = 0; i < n_pkts; i++) {
uint8_t *pkt_data = rte_pktmbuf_mtod(pkts[i],
@@
-337,7
+318,7
@@
rte_port_source_stats_read(void *port,
struct rte_port_in_stats *stats, int clear)
{
struct rte_port_source *p =
struct rte_port_in_stats *stats, int clear)
{
struct rte_port_source *p =
-
(struct rte_port_source *)
port;
+ port;
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
@@
-414,7
+395,7
@@
pcap_sink_open(struct rte_port_sink *port,
static void
pcap_sink_write_pkt(struct rte_port_sink *port, struct rte_mbuf *mbuf)
{
static void
pcap_sink_write_pkt(struct rte_port_sink *port, struct rte_mbuf *mbuf)
{
- uint8_t *pcap_dumper = (
uint8_t *)(
port->dumper);
+ uint8_t *pcap_dumper = (port->dumper);
struct pcap_pkthdr pcap_hdr;
uint8_t jumbo_pkt_buf[ETHER_MAX_JUMBO_FRAME_LEN];
uint8_t *pkt;
struct pcap_pkthdr pcap_hdr;
uint8_t jumbo_pkt_buf[ETHER_MAX_JUMBO_FRAME_LEN];
uint8_t *pkt;
@@
-538,7
+519,7
@@
rte_port_sink_create(void *params, int socket_id)
static int
rte_port_sink_tx(void *port, struct rte_mbuf *pkt)
{
static int
rte_port_sink_tx(void *port, struct rte_mbuf *pkt)
{
- struct rte_port_sink *p =
(struct rte_port_sink *)
port;
+ struct rte_port_sink *p = port;
RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1);
if (p->dumper != NULL)
RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1);
if (p->dumper != NULL)
@@
-553,7
+534,7
@@
static int
rte_port_sink_tx_bulk(void *port, struct rte_mbuf **pkts,
uint64_t pkts_mask)
{
rte_port_sink_tx_bulk(void *port, struct rte_mbuf **pkts,
uint64_t pkts_mask)
{
- struct rte_port_sink *p =
(struct rte_port_sink *)
port;
+ struct rte_port_sink *p = port;
if ((pkts_mask & (pkts_mask + 1)) == 0) {
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
if ((pkts_mask & (pkts_mask + 1)) == 0) {
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
@@
-605,7
+586,7
@@
static int
rte_port_sink_flush(void *port)
{
struct rte_port_sink *p =
rte_port_sink_flush(void *port)
{
struct rte_port_sink *p =
-
(struct rte_port_sink *)
port;
+ port;
if (p == NULL)
return 0;
if (p == NULL)
return 0;
@@
-619,7
+600,7
@@
static int
rte_port_sink_free(void *port)
{
struct rte_port_sink *p =
rte_port_sink_free(void *port)
{
struct rte_port_sink *p =
-
(struct rte_port_sink *)
port;
+ port;
if (p == NULL)
return 0;
if (p == NULL)
return 0;
@@
-636,7
+617,7
@@
rte_port_sink_stats_read(void *port, struct rte_port_out_stats *stats,
int clear)
{
struct rte_port_sink *p =
int clear)
{
struct rte_port_sink *p =
-
(struct rte_port_sink *)
port;
+ port;
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));
if (stats != NULL)
memcpy(stats, &p->stats, sizeof(p->stats));