From: Maciej Gajdzica <maciejx.t.gajdz...@intel.com>

Added statistics for ring writer nodrop port.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica at intel.com>
---
 config/common_bsdapp            |    1 +
 config/common_linuxapp          |    1 +
 lib/librte_port/rte_port_ring.c |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/config/common_bsdapp b/config/common_bsdapp
index 3d250ae..8ddd84a 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -390,6 +390,7 @@ CONFIG_RTE_PORT_RING_READER_FRAG_STATS_COLLECT=n
 CONFIG_RTE_PORT_RING_WRITER_RAS_STATS_COLLECT=n
 CONFIG_RTE_PORT_RING_READER_STATS_COLLECT=n
 CONFIG_RTE_PORT_RING_WRITER_STATS_COLLECT=n
+CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n

 #
 # Compile librte_table
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 770a1f0..593fe79 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -397,6 +397,7 @@ CONFIG_RTE_PORT_RING_READER_FRAG_STATS_COLLECT=n
 CONFIG_RTE_PORT_RING_WRITER_RAS_STATS_COLLECT=n
 CONFIG_RTE_PORT_RING_READER_STATS_COLLECT=n
 CONFIG_RTE_PORT_RING_WRITER_STATS_COLLECT=n
+CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n

 #
 # Compile librte_table
diff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c
index 6d03093..b263662 100644
--- a/lib/librte_port/rte_port_ring.c
+++ b/lib/librte_port/rte_port_ring.c
@@ -359,7 +359,23 @@ rte_port_ring_writer_stats_read(void *port,
  */
 #define RTE_PORT_RING_WRITER_NODROP_APPROACH                  1

+#ifdef RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT
+
+#define RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(port, val) \
+       port->stats.n_pkts_in += val
+#define RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_DROP_ADD(port, val) \
+       port->stats.n_pkts_drop += val
+
+#else
+
+#define RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(port, val)
+#define RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_DROP_ADD(port, val)
+
+#endif
+
 struct rte_port_ring_writer_nodrop {
+       struct rte_port_out_stats stats;
+
        struct rte_mbuf *tx_buf[RTE_PORT_IN_BURST_SIZE_MAX];
        struct rte_ring *ring;
        uint32_t tx_burst_sz;
@@ -429,6 +445,7 @@ send_burst_nodrop(struct rte_port_ring_writer_nodrop *p)
        }

        /* We didn't send the packets in maximum allowed attempts */
+       RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_DROP_ADD(p, p->tx_buf_count - 
nb_tx);
        for ( ; nb_tx < p->tx_buf_count; nb_tx++)
                rte_pktmbuf_free(p->tx_buf[nb_tx]);

@@ -442,6 +459,7 @@ rte_port_ring_writer_nodrop_tx(void *port, struct rte_mbuf 
*pkt)
                        (struct rte_port_ring_writer_nodrop *) port;

        p->tx_buf[p->tx_buf_count++] = pkt;
+       RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
        if (p->tx_buf_count >= p->tx_burst_sz)
                send_burst_nodrop(p);

@@ -462,6 +480,7 @@ rte_port_ring_writer_nodrop_tx_bulk(void *port,
                uint64_t n_pkts = __builtin_popcountll(pkts_mask);
                uint32_t i;

+               RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, n_pkts);
                for (i = 0; i < n_pkts; i++) {
                        struct rte_mbuf *pkt = pkts[i];

@@ -476,6 +495,7 @@ rte_port_ring_writer_nodrop_tx_bulk(void *port,
                        struct rte_mbuf *pkt = pkts[pkt_index];

                        p->tx_buf[p->tx_buf_count++] = pkt;
+                       RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
                        if (p->tx_buf_count >= p->tx_burst_sz)
                                send_burst_nodrop(p);
                        pkts_mask &= ~pkt_mask;
@@ -507,6 +527,7 @@ rte_port_ring_writer_nodrop_tx_bulk(void *port,
                if (tx_buf_count)
                        send_burst_nodrop(p);

+               RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, n_pkts);
                n_pkts_ok = rte_ring_sp_enqueue_burst(p->ring, (void **)pkts, 
n_pkts);

                if (n_pkts_ok >= n_pkts)
@@ -528,6 +549,7 @@ rte_port_ring_writer_nodrop_tx_bulk(void *port,
                        struct rte_mbuf *pkt = pkts[pkt_index];

                        p->tx_buf[tx_buf_count++] = pkt;
+                       RTE_PORT_RING_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
                        pkts_mask &= ~pkt_mask;
                }

@@ -571,6 +593,22 @@ rte_port_ring_writer_nodrop_free(void *port)
        return 0;
 }

+static int
+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_ring_writer_nodrop *) 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
  */
@@ -596,4 +634,5 @@ struct rte_port_out_ops rte_port_ring_writer_nodrop_ops = {
        .f_tx = rte_port_ring_writer_nodrop_tx,
        .f_tx_bulk = rte_port_ring_writer_nodrop_tx_bulk,
        .f_flush = rte_port_ring_writer_nodrop_flush,
+       .f_stats = rte_port_ring_writer_nodrop_stats_read,
 };
-- 
1.7.9.5

Reply via email to