DPDK patches and discussions
 help / color / mirror / Atom feed
From: Michal Jastrzebski <michalx.k.jastrzebski@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v4 11/13] port: added port_sched_writer stats
Date: Mon,  8 Jun 2015 17:00:02 +0200	[thread overview]
Message-ID: <1433775616-6896-12-git-send-email-michalx.k.jastrzebski@intel.com> (raw)
In-Reply-To: <1433775616-6896-1-git-send-email-michalx.k.jastrzebski@intel.com>

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

Added statistics for sched writer port.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
 lib/librte_port/rte_port_sched.c |   57 ++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/lib/librte_port/rte_port_sched.c b/lib/librte_port/rte_port_sched.c
index a82e4fa..c5ff8ab 100644
--- a/lib/librte_port/rte_port_sched.c
+++ b/lib/librte_port/rte_port_sched.c
@@ -132,7 +132,23 @@ rte_port_sched_reader_stats_read(void *port,
 /*
  * Writer
  */
+#ifdef RTE_PORT_STATS_COLLECT
+
+#define RTE_PORT_SCHED_WRITER_STATS_PKTS_IN_ADD(port, val) \
+	port->stats.n_pkts_in += val
+#define RTE_PORT_SCHED_WRITER_STATS_PKTS_DROP_ADD(port, val) \
+	port->stats.n_pkts_drop += val
+
+#else
+
+#define RTE_PORT_SCHED_WRITER_STATS_PKTS_IN_ADD(port, val)
+#define RTE_PORT_SCHED_WRITER_STATS_PKTS_DROP_ADD(port, val)
+
+#endif
+
 struct rte_port_sched_writer {
+	struct rte_port_out_stats stats;
+
 	struct rte_mbuf *tx_buf[2 * RTE_PORT_IN_BURST_SIZE_MAX];
 	struct rte_sched_port *sched;
 	uint32_t tx_burst_sz;
@@ -180,8 +196,12 @@ rte_port_sched_writer_tx(void *port, struct rte_mbuf *pkt)
 	struct rte_port_sched_writer *p = (struct rte_port_sched_writer *) port;
 
 	p->tx_buf[p->tx_buf_count++] = pkt;
+	RTE_PORT_SCHED_WRITER_STATS_PKTS_IN_ADD(p, 1);
 	if (p->tx_buf_count >= p->tx_burst_sz) {
-		rte_sched_port_enqueue(p->sched, p->tx_buf, p->tx_buf_count);
+		__rte_unused uint32_t nb_tx;
+
+		nb_tx = rte_sched_port_enqueue(p->sched, p->tx_buf, p->tx_buf_count);
+		RTE_PORT_SCHED_WRITER_STATS_PKTS_DROP_ADD(p, p->tx_buf_count - nb_tx);
 		p->tx_buf_count = 0;
 	}
 
@@ -200,15 +220,18 @@ rte_port_sched_writer_tx_bulk(void *port,
 			((pkts_mask & bsz_mask) ^ bsz_mask);
 
 	if (expr == 0) {
+		__rte_unused uint32_t nb_tx;
 		uint64_t n_pkts = __builtin_popcountll(pkts_mask);
 
 		if (tx_buf_count) {
-			rte_sched_port_enqueue(p->sched, p->tx_buf,
+			nb_tx = rte_sched_port_enqueue(p->sched, p->tx_buf,
 				tx_buf_count);
+			RTE_PORT_SCHED_WRITER_STATS_PKTS_DROP_ADD(p, tx_buf_count - nb_tx);
 			p->tx_buf_count = 0;
 		}
 
-		rte_sched_port_enqueue(p->sched, pkts, n_pkts);
+		nb_tx = rte_sched_port_enqueue(p->sched, pkts, n_pkts);
+		RTE_PORT_SCHED_WRITER_STATS_PKTS_DROP_ADD(p, n_pkts - nb_tx);
 	} else {
 		for ( ; pkts_mask; ) {
 			uint32_t pkt_index = __builtin_ctzll(pkts_mask);
@@ -216,13 +239,17 @@ rte_port_sched_writer_tx_bulk(void *port,
 			struct rte_mbuf *pkt = pkts[pkt_index];
 
 			p->tx_buf[tx_buf_count++] = pkt;
+			RTE_PORT_SCHED_WRITER_STATS_PKTS_IN_ADD(p, 1);
 			pkts_mask &= ~pkt_mask;
 		}
 		p->tx_buf_count = tx_buf_count;
 
 		if (tx_buf_count >= p->tx_burst_sz) {
-			rte_sched_port_enqueue(p->sched, p->tx_buf,
+			__rte_unused uint32_t nb_tx;
+
+			nb_tx = rte_sched_port_enqueue(p->sched, p->tx_buf,
 				tx_buf_count);
+			RTE_PORT_SCHED_WRITER_STATS_PKTS_DROP_ADD(p, tx_buf_count - nb_tx);
 			p->tx_buf_count = 0;
 		}
 	}
@@ -236,7 +263,10 @@ rte_port_sched_writer_flush(void *port)
 	struct rte_port_sched_writer *p = (struct rte_port_sched_writer *) port;
 
 	if (p->tx_buf_count) {
-		rte_sched_port_enqueue(p->sched, p->tx_buf, p->tx_buf_count);
+		__rte_unused uint32_t nb_tx;
+
+		nb_tx = rte_sched_port_enqueue(p->sched, p->tx_buf, p->tx_buf_count);
+		RTE_PORT_SCHED_WRITER_STATS_PKTS_DROP_ADD(p, p->tx_buf_count - nb_tx);
 		p->tx_buf_count = 0;
 	}
 
@@ -257,6 +287,22 @@ rte_port_sched_writer_free(void *port)
 	return 0;
 }
 
+static int
+rte_port_sched_writer_stats_read(void *port,
+		struct rte_port_out_stats *stats, int clear)
+{
+	struct rte_port_sched_writer *p =
+		(struct rte_port_sched_writer *) 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
  */
@@ -273,4 +319,5 @@ struct rte_port_out_ops rte_port_sched_writer_ops = {
 	.f_tx = rte_port_sched_writer_tx,
 	.f_tx_bulk = rte_port_sched_writer_tx_bulk,
 	.f_flush = rte_port_sched_writer_flush,
+	.f_stats = rte_port_sched_writer_stats_read,
 };
-- 
1.7.9.5

  parent reply	other threads:[~2015-06-08 15:02 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-08 14:59 [dpdk-dev] [PATCH v4 00/13] port: added port statistics Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 01/13] port: added structures for port stats and config option Michal Jastrzebski
2015-06-18 11:03   ` Gajdzica, MaciejX T
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 02/13] port: added port_ethdev_reader stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 03/13] port: added port_ethdev_writer stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 04/13] port: added port_ethdev_writer_nodrop stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 05/13] port: added port_frag stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 06/13] port: added port_ras stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 07/13] port: added port_ring_reader stats Michal Jastrzebski
2015-06-08 14:59 ` [dpdk-dev] [PATCH v4 08/13] port: added port_ring_writer stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 09/13] port: added port_ring_writer_nodrop stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 10/13] port: added port_sched_reader stats Michal Jastrzebski
2015-06-08 15:00 ` Michal Jastrzebski [this message]
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 12/13] port: added port_source stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 13/13] port: added port_sink stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 00/10] table: added table statistics Michal Jastrzebski
2015-06-08 19:05   ` Dumitrescu, Cristian
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 01/10] table: added structure for storing table stats and config option Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 02/10] table: added acl table stats Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 03/10] table: added array " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 04/10] table: added hash_ext " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 05/10] table: added hash_key16 " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 06/10] table: added hash_key32 " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 07/10] table: added hash_key8 " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 08/10] table: added hash_lru " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 09/10] table: added lpm_ipv6 " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 10/10] table: added lpm " Michal Jastrzebski
2015-06-08 15:00 ` [dpdk-dev] [PATCH v4 1/1] pipeline: add statistics for librte_pipeline ports and tables Michal Jastrzebski
2015-06-08 19:07   ` Dumitrescu, Cristian
2015-06-08 19:04 ` [dpdk-dev] [PATCH v4 00/13] port: added port statistics Dumitrescu, Cristian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1433775616-6896-12-git-send-email-michalx.k.jastrzebski@intel.com \
    --to=michalx.k.jastrzebski@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).