pdump: fix error code check when creating/canceling pthread

[dpdk.git] / lib / librte_port / rte_port_frag.c

diff --git a/lib/librte_port/rte_port_frag.c b/lib/librte_port/rte_port_frag.c
index c4c05dc..a00c9ae 100644 (file)
--- a/lib/librte_port/rte_port_frag.c
+++ b/lib/librte_port/rte_port_frag.c
@@ -41,6 +41,20 @@
 /* Max number of fragments per packet allowed */
 #define        RTE_PORT_FRAG_MAX_FRAGS_PER_PACKET 0x80
 
+#ifdef RTE_PORT_STATS_COLLECT
+
+#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(port, val) \
+       port->stats.n_pkts_in += val
+#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(port, val) \
+       port->stats.n_pkts_drop += val
+
+#else
+
+#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(port, val)
+#define RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(port, val)
+
+#endif
+
 typedef int32_t
                (*frag_op)(struct rte_mbuf *pkt_in,
                        struct rte_mbuf **pkts_out,
@@ -50,6 +64,8 @@ typedef int32_t
                        struct rte_mempool *pool_indirect);
 
 struct rte_port_ring_reader_frag {
+       struct rte_port_in_stats stats;
+
        /* Input parameters */
        struct rte_ring *ring;
        uint32_t mtu;
@@ -72,7 +88,7 @@ static void *
 rte_port_ring_reader_frag_create(void *params, int socket_id, int is_ipv4)
 {
        struct rte_port_ring_reader_frag_params *conf =
-                       (struct rte_port_ring_reader_frag_params *) params;
+                       params;
        struct rte_port_ring_reader_frag *port;
 
        /* Check input parameters */
@@ -143,7 +159,7 @@ rte_port_ring_reader_frag_rx(void *port,
                uint32_t n_pkts)
 {
        struct rte_port_ring_reader_frag *p =
-                       (struct rte_port_ring_reader_frag *) port;
+                       port;
        uint32_t n_pkts_out;
 
        n_pkts_out = 0;
@@ -170,7 +186,9 @@ rte_port_ring_reader_frag_rx(void *port,
                /* If "pkts" buffer is empty, read packet burst from ring */
                if (p->n_pkts == 0) {
                        p->n_pkts = rte_ring_sc_dequeue_burst(p->ring,
-                               (void **) p->pkts, RTE_PORT_IN_BURST_SIZE_MAX);
+                               (void **) p->pkts, RTE_PORT_IN_BURST_SIZE_MAX,
+                               NULL);
+                       RTE_PORT_RING_READER_FRAG_STATS_PKTS_IN_ADD(p, p->n_pkts);
                        if (p->n_pkts == 0)
                                return n_pkts_out;
                        p->pos_pkts = 0;
@@ -203,6 +221,7 @@ rte_port_ring_reader_frag_rx(void *port,
 
                if (status < 0) {
                        rte_pktmbuf_free(pkt);
+                       RTE_PORT_RING_READER_FRAG_STATS_PKTS_DROP_ADD(p, 1);
                        continue;
                }
 
@@ -211,9 +230,10 @@ rte_port_ring_reader_frag_rx(void *port,
 
                /* Copy meta-data from input jumbo packet to its fragments */
                for (i = 0; i < p->n_frags; i++) {
-                       uint8_t *src = RTE_MBUF_METADATA_UINT8_PTR(pkt, 0);
+                       uint8_t *src =
+                         RTE_MBUF_METADATA_UINT8_PTR(pkt, sizeof(struct rte_mbuf));
                        uint8_t *dst =
-                               RTE_MBUF_METADATA_UINT8_PTR(p->frags[i], 0);
+                         RTE_MBUF_METADATA_UINT8_PTR(p->frags[i], sizeof(struct rte_mbuf));
 
                        memcpy(dst, src, p->metadata_size);
                }
@@ -252,6 +272,22 @@ rte_port_ring_reader_frag_free(void *port)
        return 0;
 }
 
+static int
+rte_port_frag_reader_stats_read(void *port,
+               struct rte_port_in_stats *stats, int clear)
+{
+       struct rte_port_ring_reader_frag *p =
+               port;
+
+       if (stats != NULL)
+               memcpy(stats, &p->stats, sizeof(p->stats));
+
+       if (clear)
+               memset(&p->stats, 0, sizeof(p->stats));
+
+       return 0;
+}
+
 /*
  * Summary of port operations
  */
@@ -259,10 +295,12 @@ struct rte_port_in_ops rte_port_ring_reader_ipv4_frag_ops = {
        .f_create = rte_port_ring_reader_ipv4_frag_create,
        .f_free = rte_port_ring_reader_frag_free,
        .f_rx = rte_port_ring_reader_frag_rx,
+       .f_stats = rte_port_frag_reader_stats_read,
 };
 
 struct rte_port_in_ops rte_port_ring_reader_ipv6_frag_ops = {
        .f_create = rte_port_ring_reader_ipv6_frag_create,
        .f_free = rte_port_ring_reader_frag_free,
        .f_rx = rte_port_ring_reader_frag_rx,
+       .f_stats = rte_port_frag_reader_stats_read,
 };