From patchwork Mon Mar 30 11:36:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Gajdzica X-Patchwork-Id: 4187 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 9607A5A8C; Mon, 30 Mar 2015 13:38:32 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 3CB32234 for ; Mon, 30 Mar 2015 13:38:31 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 30 Mar 2015 04:38:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="706092130" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga002.jf.intel.com with SMTP; 30 Mar 2015 04:38:27 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 13:36:27 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 13:36:25 +0200 Message-Id: <1427715385-29174-1-git-send-email-maciejx.t.gajdzica@intel.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" --- 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 f222cef..2241169 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -392,6 +392,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 67233e9..16ce4ef 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -399,6 +399,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 = {