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 E3C0DCB64 for ; Thu, 30 Apr 2015 14:13:58 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 30 Apr 2015 05:13:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,676,1422950400"; d="scan'208";a="687983271" Received: from unknown (HELO Sent) ([10.217.248.194]) by orsmga001.jf.intel.com with SMTP; 30 Apr 2015 05:13:57 -0700 Received: by Sent (sSMTP sendmail emulation); Thu, 30 Apr 2015 14:13:55 +0116 From: Michal Jastrzebski To: dev@dpdk.org Date: Thu, 30 Apr 2015 14:07:31 +0200 Message-Id: <1430395652-6852-13-git-send-email-michalx.k.jastrzebski@intel.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1430395652-6852-1-git-send-email-michalx.k.jastrzebski@intel.com> References: <1430395652-6852-1-git-send-email-michalx.k.jastrzebski@intel.com> Subject: [dpdk-dev] [PATCH v2 12/13] port: added port_source 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: Thu, 30 Apr 2015 12:13:59 -0000 From: Maciej Gajdzica Added statistics for source port. Signed-off-by: Maciej Gajdzica --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_port/rte_port_source_sink.c | 35 ++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index 06c788c..7f2554c 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -393,6 +393,7 @@ CONFIG_RTE_PORT_RING_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_READER_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_WRITER_STATS_COLLECT=n +CONFIG_RTE_PORT_SOURCE_STATS_COLLECT=n # # Compile librte_table diff --git a/config/common_linuxapp b/config/common_linuxapp index 819edea..f2d58b3 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -400,6 +400,7 @@ CONFIG_RTE_PORT_RING_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_READER_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_WRITER_STATS_COLLECT=n +CONFIG_RTE_PORT_SOURCE_STATS_COLLECT=n # # Compile librte_table diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c index b9a25bb..4f51ec7 100644 --- a/lib/librte_port/rte_port_source_sink.c +++ b/lib/librte_port/rte_port_source_sink.c @@ -42,7 +42,23 @@ /* * Port SOURCE */ +#ifdef RTE_PORT_SOURCE_STATS_COLLECT + +#define RTE_PORT_SOURCE_STATS_PKTS_IN_ADD(port, val) \ + port->stats.n_pkts_in += val +#define RTE_PORT_SOURCE_STATS_PKTS_DROP_ADD(port, val) \ + port->stats.n_pkts_drop += val + +#else + +#define RTE_PORT_SOURCE_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_SOURCE_STATS_PKTS_DROP_ADD(port, val) + +#endif + struct rte_port_source { + struct rte_port_in_stats stats; + struct rte_mempool *mempool; }; @@ -93,9 +109,27 @@ rte_port_source_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts) if (rte_mempool_get_bulk(p->mempool, (void **) pkts, n_pkts) != 0) return 0; + RTE_PORT_SOURCE_STATS_PKTS_IN_ADD(p, n_pkts); + return n_pkts; } +static int +rte_port_source_stats_read(void *port, + struct rte_port_in_stats *stats, int clear) +{ + struct rte_port_source *p = + (struct rte_port_source *) port; + + if (stats != NULL) + memcpy(stats, &p->stats, sizeof(p->stats)); + + if (clear) + memset(&p->stats, 0, sizeof(p->stats)); + + return 0; +} + /* * Port SINK */ @@ -147,6 +181,7 @@ struct rte_port_in_ops rte_port_source_ops = { .f_create = rte_port_source_create, .f_free = rte_port_source_free, .f_rx = rte_port_source_rx, + .f_stats = rte_port_source_stats_read, }; struct rte_port_out_ops rte_port_sink_ops = { -- 1.7.9.5