From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C55735A73 for ; Mon, 30 Mar 2015 12:33:44 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 30 Mar 2015 03:33:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="672512195" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga001.jf.intel.com with SMTP; 30 Mar 2015 03:33:41 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 12:31:41 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 12:28:55 +0200 Message-Id: <1427711340-29048-5-git-send-email-maciejx.t.gajdzica@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427711340-29048-1-git-send-email-maciejx.t.gajdzica@intel.com> References: <1427711340-29048-1-git-send-email-maciejx.t.gajdzica@intel.com> Subject: [dpdk-dev] [PATCH 04/13] port: added port_ethdev_writer_nodrop stats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2015 10:33:45 -0000 --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_port/rte_port_ethdev.c | 38 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index d62e6d9..ed01d2d 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -384,6 +384,7 @@ CONFIG_RTE_LIBRTE_REORDER=y CONFIG_RTE_LIBRTE_PORT=y CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n +CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n # # Compile librte_table diff --git a/config/common_linuxapp b/config/common_linuxapp index 41a00a5..6a7c5ac 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -391,6 +391,7 @@ CONFIG_RTE_LIBRTE_REORDER=y CONFIG_RTE_LIBRTE_PORT=y CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n +CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n # # Compile librte_table diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/librte_port/rte_port_ethdev.c index e9e549a..7a0c14e 100644 --- a/lib/librte_port/rte_port_ethdev.c +++ b/lib/librte_port/rte_port_ethdev.c @@ -364,7 +364,23 @@ static int rte_port_ethdev_writer_stats_read(void *port, */ #define RTE_PORT_ETHDEV_WRITER_NODROP_APPROACH 1 +#ifdef RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT + +#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(port, val) \ + port->stats.n_pkts_in += val +#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_DROP_ADD(port, val) \ + port->stats.n_pkts_drop += val + +#else + +#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_DROP_ADD(port, val) + +#endif + struct rte_port_ethdev_writer_nodrop { + struct rte_port_out_stats stats; + struct rte_mbuf *tx_buf[2 * RTE_PORT_IN_BURST_SIZE_MAX]; uint32_t tx_burst_sz; uint16_t tx_buf_count; @@ -437,6 +453,7 @@ send_burst_nodrop(struct rte_port_ethdev_writer_nodrop *p) } /* We didn't send the packets in maximum allowed attempts */ + RTE_PORT_ETHDEV_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]); @@ -450,6 +467,7 @@ rte_port_ethdev_writer_nodrop_tx(void *port, struct rte_mbuf *pkt) (struct rte_port_ethdev_writer_nodrop *) port; p->tx_buf[p->tx_buf_count++] = pkt; + RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1); if (p->tx_buf_count >= p->tx_burst_sz) send_burst_nodrop(p); @@ -470,6 +488,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port, uint64_t n_pkts = __builtin_popcountll(pkts_mask); uint32_t i; + RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, n_pkts); for (i = 0; i < n_pkts; i++) { struct rte_mbuf *pkt = pkts[i]; @@ -484,6 +503,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port, struct rte_mbuf *pkt = pkts[pkt_index]; p->tx_buf[p->tx_buf_count++] = pkt; + RTE_PORT_ETHDEV_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; @@ -515,6 +535,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port, if (tx_buf_count) send_burst_nodrop(p); + RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, n_pkts); n_pkts_ok = rte_eth_tx_burst(p->port_id, p->queue_id, pkts, n_pkts); @@ -537,6 +558,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port, struct rte_mbuf *pkt = pkts[pkt_index]; p->tx_buf[tx_buf_count++] = pkt; + RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1); pkts_mask &= ~pkt_mask; } @@ -580,6 +602,21 @@ rte_port_ethdev_writer_nodrop_free(void *port) return 0; } +static int rte_port_ethdev_writer_nodrop_stats_read(void *port, + struct rte_port_out_stats *stats, int clear) +{ + struct rte_port_ethdev_writer_nodrop *p = + (struct rte_port_ethdev_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 */ @@ -605,4 +642,5 @@ struct rte_port_out_ops rte_port_ethdev_writer_nodrop_ops = { .f_tx = rte_port_ethdev_writer_nodrop_tx, .f_tx_bulk = rte_port_ethdev_writer_nodrop_tx_bulk, .f_flush = rte_port_ethdev_writer_nodrop_flush, + .f_stats = rte_port_ethdev_writer_nodrop_stats_read, }; -- 1.7.9.5