From 472f99696db0869a5e6740bd783936698fd073fa Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 30 Nov 2015 20:41:10 +0000 Subject: [PATCH] port: fix sink port statistics Fixes the sink port statistics incomplete problem. Fixes: ef3403fb6f9a ("port: source and sink") Signed-off-by: Fan Zhang Acked-by: Cristian Dumitrescu --- lib/librte_port/rte_port_source_sink.c | 63 ++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c index 5e101449f9..a06477ea60 100644 --- a/lib/librte_port/rte_port_source_sink.c +++ b/lib/librte_port/rte_port_source_sink.c @@ -139,28 +139,64 @@ rte_port_source_stats_read(void *port, /* * Port SINK */ +#ifdef RTE_PORT_STATS_COLLECT + +#define RTE_PORT_SINK_STATS_PKTS_IN_ADD(port, val) \ + (port->stats.n_pkts_in += val) +#define RTE_PORT_SINK_STATS_PKTS_DROP_ADD(port, val) \ + (port->stats.n_pkts_drop += val) + +#else + +#define RTE_PORT_SINK_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_SINK_STATS_PKTS_DROP_ADD(port, val) + +#endif + +struct rte_port_sink { + struct rte_port_out_stats stats; +}; + static void * -rte_port_sink_create(__rte_unused void *params, __rte_unused int socket_id) +rte_port_sink_create(__rte_unused void *params, int socket_id) { - return (void *) 1; + struct rte_port_sink *port; + + /* Memory allocation */ + port = rte_zmalloc_socket("PORT", sizeof(*port), + RTE_CACHE_LINE_SIZE, socket_id); + if (port == NULL) { + RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__); + return NULL; + } + + return port; } static int -rte_port_sink_tx(__rte_unused void *port, struct rte_mbuf *pkt) +rte_port_sink_tx(void *port, struct rte_mbuf *pkt) { + __rte_unused struct rte_port_sink *p = (struct rte_port_sink *) port; + + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1); rte_pktmbuf_free(pkt); + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, 1); return 0; } static int -rte_port_sink_tx_bulk(__rte_unused void *port, struct rte_mbuf **pkts, +rte_port_sink_tx_bulk(void *port, struct rte_mbuf **pkts, uint64_t pkts_mask) { + __rte_unused struct rte_port_sink *p = (struct rte_port_sink *) port; + if ((pkts_mask & (pkts_mask + 1)) == 0) { uint64_t n_pkts = __builtin_popcountll(pkts_mask); uint32_t i; + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, n_pkts); + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, n_pkts); for (i = 0; i < n_pkts; i++) { struct rte_mbuf *pkt = pkts[i]; @@ -172,6 +208,8 @@ rte_port_sink_tx_bulk(__rte_unused void *port, struct rte_mbuf **pkts, uint64_t pkt_mask = 1LLU << pkt_index; struct rte_mbuf *pkt = pkts[pkt_index]; + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1); + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, 1); rte_pktmbuf_free(pkt); pkts_mask &= ~pkt_mask; } @@ -180,6 +218,22 @@ rte_port_sink_tx_bulk(__rte_unused void *port, struct rte_mbuf **pkts, return 0; } +static int +rte_port_sink_stats_read(void *port, struct rte_port_out_stats *stats, + int clear) +{ + struct rte_port_sink *p = + (struct rte_port_sink *) 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 */ @@ -196,4 +250,5 @@ struct rte_port_out_ops rte_port_sink_ops = { .f_tx = rte_port_sink_tx, .f_tx_bulk = rte_port_sink_tx_bulk, .f_flush = NULL, + .f_stats = rte_port_sink_stats_read, }; -- 2.20.1