From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 6EB0B5A8C for ; Mon, 30 Mar 2015 12:46:54 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 30 Mar 2015 03:46:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="706072538" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga002.jf.intel.com with SMTP; 30 Mar 2015 03:46:51 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 12:40:36 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 12:28:58 +0200 Message-Id: <1427711340-29048-8-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 07/13] port: added port_ring_reader 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:46:54 -0000 --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_port/rte_port_ring.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index 0e73ce6..b51095c 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -387,6 +387,7 @@ CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n 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 # # Compile librte_table diff --git a/config/common_linuxapp b/config/common_linuxapp index cef8be0..d84d2cf 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -394,6 +394,7 @@ CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n 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 # # Compile librte_table diff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c index 371bb1e..6c5b514 100644 --- a/lib/librte_port/rte_port_ring.c +++ b/lib/librte_port/rte_port_ring.c @@ -42,7 +42,23 @@ /* * Port RING Reader */ +#ifdef RTE_PORT_RING_READER_STATS_COLLECT + +#define RTE_PORT_RING_READER_STATS_PKTS_IN_ADD(port, val) \ + port->stats.n_pkts_in += val +#define RTE_PORT_RING_READER_STATS_PKTS_DROP_ADD(port, val) \ + port->stats.n_pkts_drop += val + +#else + +#define RTE_PORT_RING_READER_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_RING_READER_STATS_PKTS_DROP_ADD(port, val) + +#endif + struct rte_port_ring_reader { + struct rte_port_in_stats stats; + struct rte_ring *ring; }; @@ -77,8 +93,12 @@ static int rte_port_ring_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts) { struct rte_port_ring_reader *p = (struct rte_port_ring_reader *) port; + uint32_t nb_rx; + + nb_rx = rte_ring_sc_dequeue_burst(p->ring, (void **) pkts, n_pkts); + RTE_PORT_RING_READER_STATS_PKTS_IN_ADD(p, nb_rx); - return rte_ring_sc_dequeue_burst(p->ring, (void **) pkts, n_pkts); + return nb_rx; } static int @@ -94,6 +114,22 @@ rte_port_ring_reader_free(void *port) return 0; } +static int +rte_port_ring_reader_stats_read(void *port, + struct rte_port_in_stats *stats, int clear) +{ + struct rte_port_ring_reader *p = + (struct rte_port_ring_reader *) port; + + if (stats != NULL) + memcpy(stats, &p->stats, sizeof(p->stats)); + + if (clear) + memset(&p->stats, 0, sizeof(p->stats)); + + return 0; +} + /* * Port RING Writer */ @@ -503,6 +539,7 @@ struct rte_port_in_ops rte_port_ring_reader_ops = { .f_create = rte_port_ring_reader_create, .f_free = rte_port_ring_reader_free, .f_rx = rte_port_ring_reader_rx, + .f_stats = rte_port_ring_reader_stats_read, }; struct rte_port_out_ops rte_port_ring_writer_ops = { -- 1.7.9.5